Merge commit 'origin/master'
authorSnafu <stuff@c-gabriel.at>
Sun, 9 May 2010 09:37:52 +0000 (11:37 +0200)
committerSnafu <stuff@c-gabriel.at>
Sun, 9 May 2010 09:37:52 +0000 (11:37 +0200)

Trivial merge