merge of 7af01deb5f2ccfe6a46c47c7d3366897760b7f50
authorKoen Kooi <koen@openembedded.org>
Sat, 8 Jul 2006 14:47:06 +0000 (14:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 14:47:06 +0000 (14:47 +0000)
     and c1685b2c79265f6c5323c93187c06401cf52accb


Trivial merge