merge of 'cec78a074a0675e54847a082185ddf501faa9d67'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Feb 2007 15:47:32 +0000 (15:47 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Feb 2007 15:47:32 +0000 (15:47 +0000)
     and 'd5039444b5c22adb43780c8597c4071b78d8f486'


Trivial merge