merge of '3019a41b13454b8c73c07731830e179cef6cf1a1'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 21:46:26 +0000 (21:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 21:46:26 +0000 (21:46 +0000)
     and 'fe5436e72a8ae2a8f3be6a00ae94615704cf38a1'


Trivial merge