merge of '061e46a6247ee375f1eb975b1700e93e10652cb9'
authorThomas Kunze <thommycheck@gmx.de>
Thu, 4 Sep 2008 13:41:45 +0000 (13:41 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Thu, 4 Sep 2008 13:41:45 +0000 (13:41 +0000)
     and 'a8b3738fe9d7578507efdb8edd971c36ca53b159'


Trivial merge