merge of '4f21e6a0ce9a2c97bca701888317b5948bf2c04b'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 25 Jul 2008 14:38:21 +0000 (14:38 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 25 Jul 2008 14:38:21 +0000 (14:38 +0000)
     and 'fc9f8d158891edd33f035f3b503d28695ae95419'


Trivial merge