merge of 401e5a3d3886286d5d38029666c6ac415b7be733
authorKoen Kooi <koen@openembedded.org>
Mon, 26 Jun 2006 17:29:25 +0000 (17:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Jun 2006 17:29:25 +0000 (17:29 +0000)
     and 579cd260bbdc718a32d629b94fbece89881341a8


Trivial merge