merge of 78224668a76c9e5a8eb51b5e4683dac08c86d491
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Apr 2006 11:30:56 +0000 (11:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 11:30:56 +0000 (11:30 +0000)
     and 9fb367cc630cde7d5a99ef88ca4205d54aeb4dd9


Trivial merge