merge of '1bc14b7ef5beb91bf437549772b7bd6d03474c41'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 09:34:22 +0000 (09:34 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 3 Apr 2007 09:34:22 +0000 (09:34 +0000)
     and 'c5f3f5599a368da1252e13923d70c4444c5609fa'


Trivial merge