merge of '0636d241febb1e9b04366ce2e9bf469251c2c14f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Jun 2008 12:59:44 +0000 (12:59 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 5 Jun 2008 12:59:44 +0000 (12:59 +0000)
     and '1eef1e73b5df2199d8f8c55ab376f7960e408465'


Trivial merge