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)
commit08b73b8ed63cc91c829976623621977d82e578ac
tree6aa6429eeb0fc03daaa015d320f257e18ee6e6da
parent7b0ce4836c7f3978365f44af18c6f11c3c522d5f
parent2ab6f081474099fd6e359c9f3f36b78a2bd10604
Merge ... '45e28823197989e0c3767d4f08431f1e6f35eadb'
     and '62cb46ad02f4194aef0171985c7b9bd0137db6af'