merge of '8ec01836d59cebe05395b5dab405fb4b2839d7b7'
authorKoen Kooi <koen@openembedded.org>
Fri, 27 Apr 2007 17:48:50 +0000 (17:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 27 Apr 2007 17:48:50 +0000 (17:48 +0000)
     and 'b610299826648469b3d71e42e60bdf8bb88e8c08'


Trivial merge