merge of 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 25 Jul 2007 10:32:51 +0000 (10:32 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 25 Jul 2007 10:32:51 +0000 (10:32 +0000)
     and 'f963a995fb5f15bcaa6aa8a1ef6f5081ec15fa3b'


Trivial merge