merge of '59f75bdc33171d30c812abb8da6d9bfb4c9aed68'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:50:49 +0000 (10:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:50:49 +0000 (10:50 +0000)
     and 'ef143b9e79670f22adae297b18184da3cf9c8769'


Trivial merge