merge of '228193d507da8cea1fcf8c9e3c43ccb070860df0'
authorKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 11:35:17 +0000 (11:35 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 12 Nov 2007 11:35:17 +0000 (11:35 +0000)
commit93ce1cb0988553da44610a7e584880449c962252
treec743c91a3de8885e6b84693f0634f99ee5ceed89
parente8f739857126075e2af0af0a27467b0b72214358
parent9cd8b738923ec0f52c39bd8c1d342533d2038602
Merge ... '228193d507da8cea1fcf8c9e3c43ccb070860df0'
     and '98155415179a9d159b94176f081aef69657bd2cd'