merge of 57049c964aaa418dc6616a940358cef3ba2d9c93
authorKoen Kooi <koen@openembedded.org>
Tue, 27 Jun 2006 10:20:49 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Jun 2006 10:20:49 +0000 (10:20 +0000)
     and c880d1638f21e30343870a64fdfc3dc42c537574


Trivial merge