Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 14:36:34 +0000 (15:36 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 8 Jan 2010 14:36:34 +0000 (15:36 +0100)

Trivial merge