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)
     and '8b3a67ccc6702adf7417536b79a65639ea24c07b'


Trivial merge