Merge http://git.einval.com/git/debian.org
authorTollef Fog Heen <tfheen@err.no>
Tue, 18 Oct 2011 14:23:45 +0000 (16:23 +0200)
committerTollef Fog Heen <tfheen@err.no>
Tue, 18 Oct 2011 14:23:45 +0000 (16:23 +0200)
Signed-off-by: Tollef Fog Heen <tfheen@err.no>

Trivial merge