merge of '58f3d45c535ca2e847a96727f15d71f43b0fe468'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 11:52:54 +0000 (11:52 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 4 Apr 2008 11:52:54 +0000 (11:52 +0000)
     and 'd8ca7c9582946cb5d871bb08cc67c3739e85b1c2'


Trivial merge