merge of '53e608aeb23095887be63ad8796f84461a850a1b'
authorKoen Kooi <koen@openembedded.org>
Wed, 4 Jun 2008 09:43:40 +0000 (09:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 4 Jun 2008 09:43:40 +0000 (09:43 +0000)
     and 'd2747ed616c9b8d91ec15a38b2ed5183e011220e'


Trivial merge