merge of '84875aef79b13e95114cd19f24c98b10531b29a7'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 28 Mar 2008 20:32:50 +0000 (20:32 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 28 Mar 2008 20:32:50 +0000 (20:32 +0000)
     and 'cfb7d5ebc09f125eccc955d0f2a4c525cf083f94'


Trivial merge