Merge remote branch 'origin/diabolik/stein1x'
authortzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 11:43:41 +0000 (12:43 +0100)
committertzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 11:43:41 +0000 (12:43 +0100)

Trivial merge