Merge branch 'leafcutter' master
authorKen Gilmer <kgilmer@buglabs.net>
Wed, 4 May 2011 12:05:15 +0000 (21:05 +0900)
committerKen Gilmer <kgilmer@buglabs.net>
Wed, 4 May 2011 12:05:15 +0000 (21:05 +0900)
commita4c1eef8d141071cb301085df40a60b5ee925d48
treecf436d3d04a14a770f5feceb31ebf68c262497ee
parent951d4f363a3a610e2985f90908264c61e0499651
parent3ffadb57137fccd5a1c6a1e54b3e42b27507a1f9
Merge branch 'leafcutter'

Conflicts:
buglabs-scripts/reinstate-build-env
recipes/tasks/task-bug.bb
recipes/tasks/task-bug.bb