merge of '566766a2d7562a96a2abccaf2cea055e8c0cbfc6'
authorKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 11:13:02 +0000 (11:13 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 29 Nov 2006 11:13:02 +0000 (11:13 +0000)
     and 'efd4f14c4b3b225594b87a854b5848082b05669d'


Trivial merge