Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 14 May 2010 02:33:01 +0000 (22:33 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 14 May 2010 02:33:01 +0000 (22:33 -0400)

Trivial merge