merging refs/remotes/origin/master into HEAD
authormorty <morty@gmx.net>
Wed, 19 Jan 2011 19:22:42 +0000 (20:22 +0100)
committermorty <morty@gmx.net>
Wed, 19 Jan 2011 19:22:42 +0000 (20:22 +0100)

Trivial merge