merge of '0340844fa6dec3078e66fa33da6ff6e42090cf32'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 11:43:58 +0000 (11:43 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 11:43:58 +0000 (11:43 +0000)
commit19711ba264ecf5b93f70f73896608aca29cadeef
tree6528a4095e88eac53ef2097bf713763fd7db4521
parent7085289d77b701e5617fc8ab17cb4641dc32ead0
parent60bf325ef367ef3820d3b54227815fa478d94c38
Merge ... '0340844fa6dec3078e66fa33da6ff6e42090cf32'
     and '5e41bb4f3a91a4ca575844d0563d02e7659d4217'