merge of '32e3cb7e99864d52a06bdc489a128fc6d02960c2'
authorKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 13:10:24 +0000 (13:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 13:10:24 +0000 (13:10 +0000)
     and '9f20eba616b60c443a76d8de23b3759590c868c8'


Trivial merge