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)
commit855ac358fabe10b5d2f31daec71175e439209ab0
tree45571bbd6a8c610edd88ea665036ee4c91bd27b7
parente717e58232af7866c11f49a825aa68ec2ade0f8c
parentf9d8ddf6ba3c742d1d82fe2b8f054c17af4f9e03
Merge ... '5cb43bc2478385cf9482f3ea62f124371d55a502'
     and 'f14dc76b249ade5d8a8c2775ca404a4f018a42b8'