merge of '03587c20291556862ac9f9a01ffae714e148ee09'
authorKoen Kooi <koen@openembedded.org>
Sat, 19 May 2007 13:03:00 +0000 (13:03 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 19 May 2007 13:03:00 +0000 (13:03 +0000)
     and '9fd173bf23fee5962a344833fe83c655b9212c30'


Trivial merge