merge of 063a83fd9a6c656a5d54258b7c3e437e159f7302
authorKoen Kooi <koen@openembedded.org>
Mon, 5 Jun 2006 16:41:53 +0000 (16:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Jun 2006 16:41:53 +0000 (16:41 +0000)
     and e754f038eb03281981bba6e48f154314cd9f8a79


Trivial merge