Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 25 Sep 2010 11:37:00 +0000 (13:37 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 25 Sep 2010 11:37:00 +0000 (13:37 +0200)

Trivial merge