merge of '903b9a5eb1d39b78da1e187836b7e48392af7847'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 01:44:22 +0000 (01:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 01:44:22 +0000 (01:44 +0000)
     and '96bb50b900f61d2cb575adb3ca0b6db5a6694ee2'


Trivial merge