merge of 6e9e8adcb21fef25823c9f2d82e7207a517c308a
authorKoen Kooi <koen@openembedded.org>
Fri, 3 Mar 2006 17:00:58 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Mar 2006 17:00:58 +0000 (17:00 +0000)
     and 93aa2173d41c73ee5f9af3bc402117d7287055c2


Trivial merge