merge of '69edd2665ebcc2300e8bc7e99639c741befd2ec0'
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:46:08 +0000 (16:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:46:08 +0000 (16:46 +0000)
     and 'ecf409702bbbc60edfa91a94b9437b9c1f04fc25'


Trivial merge