merge of 'acd40ed8d57971494f1b3dea27c1e5c3ab6b2a7f'
authorThomas Kunze <thommycheck@gmx.de>
Tue, 15 Apr 2008 11:00:44 +0000 (11:00 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Tue, 15 Apr 2008 11:00:44 +0000 (11:00 +0000)
     and 'ff7245ddafaf0bcb4c4a73dea132994953a8ff8c'


Trivial merge