Merge branch 'upstream'
authorgregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:44:53 +0000 (19:44 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:44:53 +0000 (19:44 +0100)

Trivial merge