merge of '4628771529e2ed24d72e3df800feb7a575c330e7'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 1 May 2007 16:41:06 +0000 (16:41 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 1 May 2007 16:41:06 +0000 (16:41 +0000)
commit8022e97c116af8ac1433db41dbe70f7fdf56cee1
tree86b5864b114bc42b71cfc0b6cd9f7d1eb139e552
parent93e261aa5a108614f041be38934ddb29b5e6e911
parent9c4f5f2745e24cf8e99e63e345ed8408f0a7c06b
Merge ... '4628771529e2ed24d72e3df800feb7a575c330e7'
     and 'c18c0af8649c4f70f923fefaa9e42158e83c3881'