merge of '7845f20bb970124a1ca02e777d622c6f8e4cc0e0'
authorThomas Kunze <thommycheck@gmx.de>
Tue, 15 Apr 2008 11:00:53 +0000 (11:00 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Tue, 15 Apr 2008 11:00:53 +0000 (11:00 +0000)
     and 'b46f413485607ea3e782a93b2fbc4b59966947fe'


Trivial merge