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)
commit26f91ec44151a67d57312f9d48360680d593fe8e
treeee38fb6a2e85f505221c0492a10c7a6b6226da5a
parent866e3e95ab13237e4046da39b36ae39b6b209c0d
parentcf3f7de1ad0dc67c52d5cb9c53738d3d50de9e00
Merge ... '32c8db327cd1e1f0aa847b064a8ea651c9b43151'
     and 'b2bb7f5443888289a4345b8c498230f37e6cff84'