merge of 'c89f8d947c6b86b58fd1337e27c43626e0c7ee3d'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 18:14:59 +0000 (18:14 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 18:14:59 +0000 (18:14 +0000)
     and 'e2e070bd3687d84d8c7897c67ef530276f7c443b'


Trivial merge