merge of '63851b92b9273aff39e9034738719537beaaad00'
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 09:10:43 +0000 (09:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 24 Aug 2007 09:10:43 +0000 (09:10 +0000)
     and 'ad034cb2f897fe4f3dcd97de6ff164e3a696598f'


Trivial merge