merge of '5112c5ba79fa1a1fc2a20c61652fd3ab8ef6b833'
authorKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 12:59:38 +0000 (12:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 12:59:38 +0000 (12:59 +0000)
commit5be0719133cbeebdf81aefb74e6ae4320b1a8e54
treebc35ea55ce01c189e2be2ea17c89b4e5e78d57bb
parent4ee83819da29ec0864fb809ddc2cb31d59c46c29
parent6d62ed6417b5cb724ae4699e921afcd9883f199f
Merge ... '5112c5ba79fa1a1fc2a20c61652fd3ab8ef6b833'
     and '8b3a67ccc6702adf7417536b79a65639ea24c07b'