Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 10 Jan 2010 00:44:25 +0000 (01:44 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 10 Jan 2010 00:44:25 +0000 (01:44 +0100)

Trivial merge