merge of '71635c6dc57d6cc221c7f87d1820130c74ed3ba1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 17:22:18 +0000 (17:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 17:22:18 +0000 (17:22 +0000)
     and 'e5ca2be92e2e455ddafe9234b967650570ba1462'


Trivial merge