merge of 37906cae8de28e3888cce307d6dbdab279f57164
authorKoen Kooi <koen@openembedded.org>
Wed, 8 Feb 2006 10:24:17 +0000 (10:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 10:24:17 +0000 (10:24 +0000)
     and f076172bf11be4df22001e51898b11d9f9e2050d


Trivial merge