merge of '035b260708b79727e8be13177849b2e99a73cf2f'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:08:51 +0000 (12:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:08:51 +0000 (12:08 +0000)
commit677ecc4cb5820d2e6fbfba113a8ff335215393c8
treeeeee5de33abfd3dbfb97c278e1a0d7f5479cb120
parent5f61eb5253c25e2612ad736140194ff4f423433c
parentda08d964df3d8670e4a296b77960442b71a02dfa
Merge ... '035b260708b79727e8be13177849b2e99a73cf2f'
     and '5b87de517d4f4c222133820a354191f66043e5eb'