Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 14 Mar 2010 23:31:13 +0000 (00:31 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 14 Mar 2010 23:31:13 +0000 (00:31 +0100)

Trivial merge