merge of '72dbc16dce7e66fe79d27960cc49c7f53a01d917'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 19 Oct 2007 17:08:24 +0000 (17:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 19 Oct 2007 17:08:24 +0000 (17:08 +0000)
     and '83cf3f456a3c8033d8c040ae2e89d36ef5a1f05b'


Trivial merge