merge of '804173890b0c2381f9e13e27fce36c3396184943'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 10:35:47 +0000 (10:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Feb 2007 10:35:47 +0000 (10:35 +0000)
     and '83e041bc8cc5227a7a45dd6a81c52b97ebcb893d'


Trivial merge