Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 25 Sep 2011 15:07:24 +0000 (17:07 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 25 Sep 2011 15:07:24 +0000 (17:07 +0200)

Trivial merge