Merge commit 'lewurm/master'
authorSnafu <stuff@c-gabriel.at>
Mon, 17 May 2010 18:23:48 +0000 (20:23 +0200)
committerSnafu <stuff@c-gabriel.at>
Mon, 17 May 2010 18:23:48 +0000 (20:23 +0200)

Trivial merge