merge of '00032e7126f86cd85fcd04db2fbf6b89c2502be7'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 10:50:59 +0000 (10:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 10:50:59 +0000 (10:50 +0000)
commit72821c3c1e7ab4941e22f2809eb3d58b04b292a6
treecc3ab81025d8c3e8393c5d92604bc5083825b447
parente9763f40737a710b00a486b2fadeb4ab55a2f3e3
parent275c7f4eec3ace85d09ff95c4b41468b2c4c8dab
Merge ... '00032e7126f86cd85fcd04db2fbf6b89c2502be7'
     and 'a0b62356b744396a4e9fc284292fa4df77a1a99e'