merge of '30fdc7758a8b7a86b7d59101eff9bd0011257d00'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 May 2007 16:28:33 +0000 (16:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 May 2007 16:28:33 +0000 (16:28 +0000)
commit990b019a04cec33468b447bbe0166c7bd970f8ed
tree19571aa6066d3e8d9e4db1eca440a2d6481234e0
parent6cc52db97e28988e3ada9746c5e3a910571bf76f
parent9dae835ef374adaae20d75eba1109bb307c249bd
Merge ... '30fdc7758a8b7a86b7d59101eff9bd0011257d00'
     and '9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f'