merge of 'dd905d1faac53a401f49cb464e9668c7754e986b'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Dec 2006 08:11:25 +0000 (08:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Dec 2006 08:11:25 +0000 (08:11 +0000)
commit0370bb86eb076c168f8bd7930c06c3f5d8a2f854
tree5886b2141b1211467745d493518228068f805da5
parent3a89ce65aad826ad0a92c90de2fc81dcc72ddc36
parentb8b9e106a7a2ee432ed3d102edeb22f25594321c
Merge ... 'dd905d1faac53a401f49cb464e9668c7754e986b'
     and 'f14146eea70011b4bb6773d8401d0068d551f29d'