merge of '32c8db327cd1e1f0aa847b064a8ea651c9b43151'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 May 2007 11:55:57 +0000 (11:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 May 2007 11:55:57 +0000 (11:55 +0000)
     and 'b2bb7f5443888289a4345b8c498230f37e6cff84'


Trivial merge