merge of '1ced81b8e37ff2e92b41ce7ba7c6d5482c409182'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 07:26:16 +0000 (07:26 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 9 Feb 2007 07:26:16 +0000 (07:26 +0000)
     and 'b5e0b951b33635fff4584dd883c6750daba2ece3'


Trivial merge