merge of 2310202db82b311ad297541e20f94d8bf5706860
authorKoen Kooi <koen@openembedded.org>
Sat, 11 Mar 2006 18:51:44 +0000 (18:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Mar 2006 18:51:44 +0000 (18:51 +0000)
     and dfcb7791f0a796aab00f40b7918a67f5022f1d07


Trivial merge