merge of '45ed15a71cd24c4894d885800ddeb8de3cdcc32c'
authorThomas Kunze <thommycheck@gmx.de>
Mon, 25 Feb 2008 15:33:27 +0000 (15:33 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Mon, 25 Feb 2008 15:33:27 +0000 (15:33 +0000)
     and '66b41c5ca5964cd5533a0eb457c78d84dce52eff'


Trivial merge