merge of '08286eac244da750fe999831d31e71eb0acd01d0'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Jun 2007 09:22:21 +0000 (09:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Jun 2007 09:22:21 +0000 (09:22 +0000)
     and '61fb94a908eb11cc06b5c0d937667da64fcc801a'


Trivial merge