merge of 8681a1676985a0df1f06fc59cc7f50915300e156
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Apr 2006 20:23:11 +0000 (20:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 20:23:11 +0000 (20:23 +0000)
     and 86e9d63c930e7cda091f0ea8b0e2e7ee3dc1f93f


Trivial merge