merge of fe620b82f3ed9b9828a78908bfe73a5c27ccc59d
authorKoen Kooi <koen@openembedded.org>
Tue, 16 May 2006 11:50:15 +0000 (11:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 11:50:15 +0000 (11:50 +0000)
     and e84b72e0b67ac92d81d1f7a72737dd8286340e5d


Trivial merge