merge of '66118fcaf02332902350af917b57b972df319ac9'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:05 +0000 (20:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 20:57:05 +0000 (20:57 +0000)
commit7e1b30bd2ac0c2d6d27813775cef64db17f04829
treed91835cae106262c71a6db563896ca36befe82a7
parentd3c0ca658f75bf8f2aa96c51126712eb8d45c875
parent59a5d68893a1833e41bc344006f044f7c6f4c758
Merge ... '66118fcaf02332902350af917b57b972df319ac9'
     and '8eb6b233aceb83e6c40ddd88e0b223a6c8eb85ab'