merge of '06fb345943334f939a5210e3a0e3c6d4edf0e6c1'
authorKoen Kooi <koen@openembedded.org>
Thu, 30 Aug 2007 12:51:14 +0000 (12:51 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 30 Aug 2007 12:51:14 +0000 (12:51 +0000)
     and 'f4febba2a3678a4948cda4320c543ed34a41ff68'


Trivial merge