merge of '4b6976e36ba815fc58bd0c8e4d468ba5c4d66aa9'
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 16:39:04 +0000 (16:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 13 Mar 2007 16:39:04 +0000 (16:39 +0000)
     and '98c0a18ce7f822abf641bfdfe37edaf50f8a1a9f'


Trivial merge