merge of '172826830c7d3f876ff4e8669bcd51356aeca353'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Jan 2007 21:47:13 +0000 (21:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Jan 2007 21:47:13 +0000 (21:47 +0000)
     and '92ee4187c8bb382362bb41e7cb287db3352a81fc'


Trivial merge