merge of '05e9902f277de28b4e08c6bb6aff89f8862b84ac'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 17 Jul 2008 19:04:31 +0000 (19:04 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 17 Jul 2008 19:04:31 +0000 (19:04 +0000)
     and '912f388483a3e1703ca89d7b2309723fd3407420'


Trivial merge