merge of '051aed6118dfe66775aef988fe3b9f0792cf80a9'
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 15:24:42 +0000 (15:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 15:24:42 +0000 (15:24 +0000)
     and 'fa33212259d3560df37f96b6f67954807659b438'


Trivial merge