merge of '45ba0b76a83341a7b25ca694349a4d574337c856'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 09:47:21 +0000 (09:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 09:47:21 +0000 (09:47 +0000)
     and '52e7ace64b2d15b51a75996b485b101f16dd40ac'


Trivial merge