merge of 4339c862c7e6e4f616af262e7f1adc11bcbd4f67
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jul 2005 16:00:20 +0000 (16:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 16:00:20 +0000 (16:00 +0000)
     and 91669c817133defa72ee377e661993b9a4e812c4


Trivial merge