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)
commitfe21f33928a3b14e7e735a83621b495500897b04
treec19c590ca7eb45cee47c71f64644fb0f9c6e377f
parentfa2e6e4b8ec83c04d2ff0bfb5891ba53ba2f549e
parentb1b994c23a68d11fc11f0242cc0ee308ca097a86
Merge ... '7f12c033c369afe355ed9fdfe14dfe1531391fac'
     and 'ff3d5f3c2da8091a3128fc9c708e8b9fac5d9a8f'