Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 19 Jul 2009 12:54:38 +0000 (14:54 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 19 Jul 2009 12:54:38 +0000 (14:54 +0200)

Trivial merge