merge of '87fd9620e17c2f95921fa9efc06c497fd665ce42'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 13:15:29 +0000 (13:15 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 13:15:29 +0000 (13:15 +0000)
     and 'd4ada8446f36d70f32222f306b5709b1048f47d7'


Trivial merge