merge of '1b152d2cb9b2c6474294b89bcc5f136f0cd95903'
authorKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 20:01:07 +0000 (20:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 20:01:07 +0000 (20:01 +0000)
     and '9acacf300b9ee3fb7ed2a73b88356b44ad0ab8d5'


Trivial merge