merge of '6257d463f8bb66aa3012de1dace0e36e69fc91a3'
authorThomas Kunze <thommycheck@gmx.de>
Tue, 26 Feb 2008 00:49:16 +0000 (00:49 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Tue, 26 Feb 2008 00:49:16 +0000 (00:49 +0000)
     and '8d3c7f116675cb37e5e2e8c85c699a0c793dd6bb'


Trivial merge