merge of '25f2070b6ff7c016172c18ddcbea754aeb7d159e'
authorKoen Kooi <koen@openembedded.org>
Tue, 22 Jul 2008 09:19:33 +0000 (09:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 22 Jul 2008 09:19:33 +0000 (09:19 +0000)
     and '719f01c7bedccc565279537ecbfdbf8a61bd9a4b'


Trivial merge