merge of 96fed78607f0529e7177d55147568944ff559a90
authorKoen Kooi <koen@openembedded.org>
Wed, 28 Jun 2006 09:02:47 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 09:02:47 +0000 (09:02 +0000)
     and c2ca1eca3e23b0468ffeab450e6a81d6ca829e45


Trivial merge