merge of '6bfdd9236ce5c2bd674bdbbed5ae1c5559601bbb'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 22:57:15 +0000 (22:57 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 22:57:15 +0000 (22:57 +0000)
     and 'fabb00d3c735a2ae45fdff625310786d786ca26b'


Trivial merge