merge of 253db2cc1289b54dcf638e5bd3cd11ae2a9c432f
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Mar 2006 15:52:58 +0000 (15:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Mar 2006 15:52:58 +0000 (15:52 +0000)
     and bee378ef0bf8d72ae3f2f94a19b1ed5b0b2f95f4


Trivial merge