merge of '0cc400441946f7a721b718fe50f7bbce5c9ea24f'
authorKoen Kooi <koen@openembedded.org>
Wed, 6 Sep 2006 10:37:33 +0000 (10:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 6 Sep 2006 10:37:33 +0000 (10:37 +0000)
     and '42be14012b6790df46c62295f3a02286acecbd4f'


Trivial merge