merge of '5cb43bc2478385cf9482f3ea62f124371d55a502'
authorKoen Kooi <koen@openembedded.org>
Wed, 29 Aug 2007 09:56:55 +0000 (09:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 29 Aug 2007 09:56:55 +0000 (09:56 +0000)
     and 'f14dc76b249ade5d8a8c2775ca404a4f018a42b8'


Trivial merge