merge of '0c8de9825ca55a0e846e8c00dd29764c73349c6f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 5 Mar 2008 16:11:13 +0000 (16:11 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 5 Mar 2008 16:11:13 +0000 (16:11 +0000)
     and 'a6f0dbe56289aad3373b7ce56ba4e2434e6da244'


Trivial merge