merge of '34e43612b25ab2cef55713b9d003cdb82e7cfa25'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Feb 2008 15:34:08 +0000 (15:34 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Feb 2008 15:34:08 +0000 (15:34 +0000)
commita368a08bce2722ba869f83f71be1e5eb3b247c8b
treeacc57fe10ccfcd2d80106def710166d2b5248e2b
parentf5201f61e5ef7c839f1deb992fa89c579f27e588
parent696e2381d893a110a8d4dd3bfd9f0311286440ac
Merge ... '34e43612b25ab2cef55713b9d003cdb82e7cfa25'
     and 'f9a76e06cd939b7150cc838a647f06ab8ae0e670'