merge of 08292c00115e7d304ae354db337ee4feee93fd17
authorKoen Kooi <koen@openembedded.org>
Sat, 20 May 2006 12:12:39 +0000 (12:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 12:12:39 +0000 (12:12 +0000)
     and 2a1f8d42cf0a5906c34ed8cd233648587be12c64


Trivial merge