merge of '1044732b8a88225ade87ce8064bd97dee00124ac'
authorKoen Kooi <koen@openembedded.org>
Wed, 3 Sep 2008 12:45:31 +0000 (12:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 3 Sep 2008 12:45:31 +0000 (12:45 +0000)
     and '462295240b0a06ab1c367eb883ec218b4313bf89'


Trivial merge