Merge branch 'buglabs-sw2.5' of github.com:buglabs/oe-buglabs into buglabs-sw2.1
authorJohn E. Connolly <jconnolly@buglabs.net>
Thu, 14 Jul 2011 14:56:51 +0000 (10:56 -0400)
committerJohn E. Connolly <jconnolly@buglabs.net>
Thu, 14 Jul 2011 14:56:51 +0000 (10:56 -0400)
commitd2ac44f5f87a91e98645ee6c1ae70fac174b541b
tree5883e303a85814a6abfd30a845e191e83f26f881
parent0cf410691a3c2281265a1c2e64823ae7644320e4
parente0e309a6c44394534d46c56eeee0e1b1760aa49c
Merge branch 'buglabs-sw2.5' of github.com:buglabs/oe-buglabs into buglabs-sw2.1

Conflicts:
recipes/tasks/task-bug.bb
recipes/tasks/task-bug.bb