merge of '9958e850eb5662928f6727c3a8ae9d71ac7f03f5'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Jul 2007 08:19:09 +0000 (08:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Jul 2007 08:19:09 +0000 (08:19 +0000)
     and 'f60008d7bc62036b2f56fac511571e1bd12c4215'


Trivial merge