Merge branch 'master' of git+ssh://git.debian.org/git/mirror/debian.org
authorSteve McIntyre <steve@einval.com>
Sat, 16 Apr 2011 18:00:39 +0000 (19:00 +0100)
committerSteve McIntyre <steve@einval.com>
Sat, 16 Apr 2011 18:00:39 +0000 (19:00 +0100)

Trivial merge