merging refs/remotes/origin/master into HEAD
authormorty <morty@gmx.net>
Sun, 16 Jan 2011 15:38:48 +0000 (16:38 +0100)
committermorty <morty@gmx.net>
Sun, 16 Jan 2011 15:38:48 +0000 (16:38 +0100)

Trivial merge