merge of '0675e9a3e7f3d9faa1311df4548be2e200c02760'
authorThomas Kunze <thommycheck@gmx.de>
Mon, 4 Aug 2008 15:13:29 +0000 (15:13 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Mon, 4 Aug 2008 15:13:29 +0000 (15:13 +0000)
     and 'ed7f086a6f3dc6bc06899e467a960cd37d7f2a9c'


Trivial merge