merge of 6859af4fc51969fe6d5b6513f506486d9437a4cd
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Jul 2006 12:11:44 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 12:11:44 +0000 (12:11 +0000)
     and 7ac1989cc542e70bbfa30cce17ca52ca532dd19e


Trivial merge