merge of '2c3f3df8f990a6610a9f87f048204b154418a06a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 08:58:05 +0000 (08:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 08:58:05 +0000 (08:58 +0000)
     and 'fa54a53ed347c26402f271ae2550d35a6849f1f6'


Trivial merge