Merge branch 'master' of /srv/git/opensource-wiki
authorPhilipp Kern <pkern@debian.org>
Fri, 23 May 2008 09:09:50 +0000 (11:09 +0200)
committerPhilipp Kern <pkern@debian.org>
Fri, 23 May 2008 09:09:50 +0000 (11:09 +0200)

Trivial merge