merge of 314e9e28fab0e5aff2e8901741180ce581d7e1fa
authorKoen Kooi <koen@openembedded.org>
Wed, 10 May 2006 12:26:48 +0000 (12:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 12:26:48 +0000 (12:26 +0000)
     and 9ef3a8d33b02c1d8a4cc2ad6eaee9326b019c33a


Trivial merge