merge of '1e0c7e9af08cc3d33b61608f1780d80214f1c51a'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:21:40 +0000 (14:21 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Aug 2008 14:21:40 +0000 (14:21 +0000)
     and 'f236af3007cc25b83011ee388e69831ee54c7be7'


Trivial merge