merge of '4d5affce3ba65df3658b9b749b1db11d11ef1d8f'
authorKoen Kooi <koen@openembedded.org>
Sun, 29 Oct 2006 11:32:36 +0000 (11:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 29 Oct 2006 11:32:36 +0000 (11:32 +0000)
commitf57b1caaca53da39b519c31db80e74dc19945394
tree9921dff49a7cc96a4e81b5f235e70152ff4a6915
parent8cfd5831084886ad06ef5ce29851b7f875951836
parent35ba94be70961fd3f916afdbf15d2a7c8304301d
Merge ... '4d5affce3ba65df3658b9b749b1db11d11ef1d8f'
     and '684595150a0e865a406770102f72a2e93285b9a3'