Merge commit 'lewurm/master' into local
authorSnafu <stuff@c-gabriel.at>
Sun, 9 May 2010 21:43:47 +0000 (23:43 +0200)
committerSnafu <stuff@c-gabriel.at>
Sun, 9 May 2010 21:43:47 +0000 (23:43 +0200)

Trivial merge