merge of '81ce749b8f57a5a56ca3f31c843da1b227a8a48d'
authorKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 16:54:57 +0000 (16:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 14 Jun 2008 16:54:57 +0000 (16:54 +0000)
     and 'e21e6187b919035f20b69c9c2a3c8f43e345d930'


Trivial merge