merge of '5d7ba35bbc10b4418bedaa07910b69c32a41cb3c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:48:57 +0000 (14:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:48:57 +0000 (14:48 +0000)
     and '716a5d6fd8174fcd76d0f8767c7ee982f27832fa'


Trivial merge