merge of '45e28823197989e0c3767d4f08431f1e6f35eadb'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 15 Sep 2006 22:37:05 +0000 (22:37 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 15 Sep 2006 22:37:05 +0000 (22:37 +0000)
     and '62cb46ad02f4194aef0171985c7b9bd0137db6af'


Trivial merge