merge of '44b48a8021a29d930331e47aac526ec54edead5a'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 10:10:26 +0000 (10:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 10:10:26 +0000 (10:10 +0000)
     and 'bffe15342c6408775c27ead21d1b984c196c3373'


Trivial merge