merge of '452ba8f483cc1f311d5139e2d406dd21e8edcce5'
authorThomas Kunze <thommycheck@gmx.de>
Thu, 28 Feb 2008 12:58:30 +0000 (12:58 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Thu, 28 Feb 2008 12:58:30 +0000 (12:58 +0000)
     and '524fc96258564567524a1295bfdf65c2a25da5d7'


Trivial merge