Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 3 Apr 2010 20:42:50 +0000 (22:42 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 3 Apr 2010 20:42:50 +0000 (22:42 +0200)

Trivial merge