merge of '76afa3fd7e5ab1e782da555eb4e4d888551a37c6'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Oct 2007 15:48:20 +0000 (15:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Oct 2007 15:48:20 +0000 (15:48 +0000)
     and 'fe4e349c9f99ffcc18a5abe8041cd3379219c456'


Trivial merge