merge of '3ba01558b82d1bb3bf15860e3d01719651ff13c6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 00:59:38 +0000 (00:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Mar 2007 00:59:38 +0000 (00:59 +0000)
     and '89809f216db3df7abbf2f0427e5fe3291e0b150e'


Trivial merge