merge of '808beacef20f045331c5d32c4a877b9010fe989a'
authorThomas Kunze <thommycheck@gmx.de>
Fri, 22 Feb 2008 20:46:27 +0000 (20:46 +0000)
committerThomas Kunze <thommycheck@gmx.de>
Fri, 22 Feb 2008 20:46:27 +0000 (20:46 +0000)
     and 'f51d223df158f1cff524858100f483e0d4918266'


Trivial merge