merge of '9addc8085e450d56da3a5559a74f27e8334b960b'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 13:57:11 +0000 (13:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 13:57:11 +0000 (13:57 +0000)
     and 'c1863be30dcd78a9ffa2826bafd953535872103b'


Trivial merge