[oe-commits] Richard Purdie : Merge branches 'master' and 'master' of ssh://git. openembedded.org/openembedded-core

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 942ab4bc77aa1bcdc7714ac6f6eba7ef7b1b93d4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=942ab4bc77aa1bcdc7714ac6f6eba7ef7b1b93d4

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sun Jul 22 11:41:57 2012 +0100

Merge branches 'master' and 'master' of ssh://git.openembedded.org/openembedded-core

---