merge of '77de2c054faaf8169bea5553ae2311a39a581403'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 14 Aug 2008 23:48:23 +0000 (23:48 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 14 Aug 2008 23:48:23 +0000 (23:48 +0000)
commite9570b88fa18c49a68b5f44bffd7e2abb101f499
tree083d8795a6ff13b6950f8da4ba4c507791b39fa2
parent8e9a327b9c3924807b7c2093d6cc910213720440
parent2792ce30ea1b3eb6a32bad578a956557e3040e89
Merge ... '77de2c054faaf8169bea5553ae2311a39a581403'
     and 'fd59ca4a2d1cdb56a15d6a3323721ce78836fe52'