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)
commit5fd4ba0f952ce906c70ad9548d213e8c9439f10d
treeb75638ada3e724286d047b2b3f55c8e6f75169d5
parent399f46f80855ab646143c4f3d5b65505b3cf36d0
parent070b8505d9e79c3fa5b84d8603774442f73d9f5d
merge of 5dbe23f7d98cb390990ba2c2f1ad27667148516a
     and 6a9ce130c03dd16448d55d8b7638ee894776e022