merge of 5dbe23f7d98cb390990ba2c2f1ad27667148516a
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Jul 2006 12:10:15 +0000 (12:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 12:10:15 +0000 (12:10 +0000)
     and 6a9ce130c03dd16448d55d8b7638ee894776e022


Trivial merge