Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Mon, 11 Jan 2010 18:16:43 +0000 (19:16 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 11 Jan 2010 18:16:43 +0000 (19:16 +0100)

Trivial merge