Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 18:34:12 +0000 (20:34 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 18:34:12 +0000 (20:34 +0200)

Trivial merge