merge of '1ba445dfd1a9b934962a4db388d6ab641b3f74e8'
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Mar 2008 18:46:06 +0000 (18:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 26 Mar 2008 18:46:06 +0000 (18:46 +0000)
     and '8f2da0702f522e178a88e3c2dd8f65e05d0680a7'


Trivial merge