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)
commitef655f681eefccbe8f16d76f954c434c52cb99a4
tree75fd577fc2f526756205fb539d577daee85eaa5c
parentf4a6a0341f8a5cb6bf30fbb3b83a225f9e2af2e9
parent775ad19d1e712b2cdff21226820f8535964a9f70
merge of 08292c00115e7d304ae354db337ee4feee93fd17
     and 2a1f8d42cf0a5906c34ed8cd233648587be12c64