Merge remote-tracking branch 'deb/debian' into debian
authorEvgeni Golov <evgeni@debian.org>
Mon, 17 Dec 2012 19:50:19 +0000 (20:50 +0100)
committerEvgeni Golov <evgeni@debian.org>
Mon, 17 Dec 2012 19:50:19 +0000 (20:50 +0100)

Trivial merge