merge of '7f12c033c369afe355ed9fdfe14dfe1531391fac'
authorKoen Kooi <koen@openembedded.org>
Wed, 28 Feb 2007 09:00:38 +0000 (09:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 28 Feb 2007 09:00:38 +0000 (09:00 +0000)
     and 'ff3d5f3c2da8091a3128fc9c708e8b9fac5d9a8f'


Trivial merge