merge of '9e2ea1f2a87bc495597a9bda44b7d5921358c104'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 19 Apr 2007 17:34:42 +0000 (17:34 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 19 Apr 2007 17:34:42 +0000 (17:34 +0000)
     and 'd18552e5056a026d8ed8959e135b2fa05c3e1b6b'


Trivial merge