merge of '59df690e4022993ebd05954ef260ae9362300ac1'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 22:28:24 +0000 (22:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 22:28:24 +0000 (22:28 +0000)
     and 'cea642eee26bd3cdd008cf21f1e1aad4ecfd69e6'


Trivial merge