Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 5 May 2009 17:57:00 +0000 (13:57 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 5 May 2009 17:57:00 +0000 (13:57 -0400)

Trivial merge