merge of '9d6e060052df45c5be50896005c5b965f0d64900'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 Jan 2008 14:08:49 +0000 (14:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 Jan 2008 14:08:49 +0000 (14:08 +0000)
commita2545abb038db58e661f28328cff70d901d4be59
tree9b58a93416096a29814346373964a30bbf542d7c
parentbea87314a68ffd51b4dce97ce4c1b9277445e264
parentb13686f579217a17eaebeef868d02c02775221a8
Merge ... '9d6e060052df45c5be50896005c5b965f0d64900'
     and 'c794a426d2a55b0c4b5f1f6fee90c8272bd266e9'