merge of '02c853aa8cfa6c38e9af2ee305306c04ac0a03fa'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Apr 2008 13:11:24 +0000 (13:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Apr 2008 13:11:24 +0000 (13:11 +0000)
     and 'e04d9a23468c5cecc2307c456ca0b4b98ad65d50'


Trivial merge