merge of '3903211109bcf34b8e6540e6f23ab4860f0236d8'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 07:17:35 +0000 (07:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 07:17:35 +0000 (07:17 +0000)
     and '5aa52a23ca3ba7054d5e294b0347d5f5e02dc077'


Trivial merge