merge of '26ec78f4f59453ecd4343ab4c92d4787ab5a81fe'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 13:05:14 +0000 (13:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 13:05:14 +0000 (13:05 +0000)
     and '33f3d0a7c4cbdff4e2348d37b7add06e6c261f0e'


Trivial merge