Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 21 May 2009 16:44:47 +0000 (12:44 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 21 May 2009 16:44:47 +0000 (12:44 -0400)

Trivial merge