merge of '172b1c53191fd7a6d9ccf76d18a5f18e78f4e8fb'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Apr 2007 15:58:11 +0000 (15:58 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Apr 2007 15:58:11 +0000 (15:58 +0000)
     and '4f869aa559939fabc96bfc535fbf2346e6269692'


Trivial merge