merge of '9d80f6499c5d862fca19d620f8124ac061dbe754'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 14:07:56 +0000 (14:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 14:07:56 +0000 (14:07 +0000)
     and 'c7115238d0f3b9fc3434adb41d77441a7ab96991'


Trivial merge