merge of '0120fd2ad75a97ec542df9f008a76db1006ee24c'
authorThomas Kunze <thommycheck@gmx.de>
Tue, 12 Feb 2008 11:16:28 +0000 (11:16 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Tue, 12 Feb 2008 11:16:28 +0000 (11:16 +0000)
     and '9f3d06c0980328d0fb67a4c6efe474543b358c01'


Trivial merge