merge of '9bafa1b756e6de75c93929437624ddf20c6155f3'
authorThomas Kunze <thommycheck@gmx.de>
Tue, 15 Apr 2008 10:39:59 +0000 (10:39 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Tue, 15 Apr 2008 10:39:59 +0000 (10:39 +0000)
     and 'ae71623a2c722c78935fc0461cdcaab87317ba3b'


Trivial merge