merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
authorKoen Kooi <koen@openembedded.org>
Thu, 27 Apr 2006 13:52:44 +0000 (13:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 13:52:44 +0000 (13:52 +0000)
     and e368307c5fec630ad2290c5e18ca93c13143d515


Trivial merge