merge of '095df9699f7a69f0e2ef180dff98382e29bbd36a'
authorKoen Kooi <koen@openembedded.org>
Wed, 20 Aug 2008 07:07:10 +0000 (07:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 20 Aug 2008 07:07:10 +0000 (07:07 +0000)
     and 'aaeb3250ce3e4d0a1735765cda4a2b588c527969'


Trivial merge