merge of '83d98662c6868a7aa140a2381a42dd66253867b5'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 22 Nov 2006 11:32:24 +0000 (11:32 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 22 Nov 2006 11:32:24 +0000 (11:32 +0000)
commit1b63429de66913920d76795eb19af26b211bd5d3
treed731fe867acf6bbd772d2b7a0014b3bede36fccf
parent1f79d34e815553402fcd3386345a6c0eaaaa74cb
parentdf56cecd68c1c2bcf772badbc19c2f78a8aec064
Merge ... '83d98662c6868a7aa140a2381a42dd66253867b5'
     and '959a6162fa3ea78b9386188cf845e87e4556c6f8'