merge of '250b98d355e1a4b79caaec9ef041f42db95a2b7f'
authorThomas Kunze <thommycheck@gmx.de>
Thu, 31 Jul 2008 23:18:29 +0000 (23:18 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Thu, 31 Jul 2008 23:18:29 +0000 (23:18 +0000)
     and '597f2d2c1d1ea251c244da83e5677a24b328d3f4'


Trivial merge