merge of '5e25d910364ba4a7edab739d7fd27220ff39668f'
authorKoen Kooi <koen@openembedded.org>
Fri, 12 Oct 2007 07:54:22 +0000 (07:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 12 Oct 2007 07:54:22 +0000 (07:54 +0000)
     and '90a4eb99d1b346a81de3232bd341d5b76a2bbc2c'


Trivial merge