merge of '3a476b00537a64a6add8bd114705a5f82eb6eef4'
authorKoen Kooi <koen@openembedded.org>
Tue, 1 Apr 2008 10:30:35 +0000 (10:30 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 1 Apr 2008 10:30:35 +0000 (10:30 +0000)
     and 'a969c8d5435c04a5d12f8d650d864e12384c7c28'


Trivial merge