Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 11 May 2011 01:34:44 +0000 (21:34 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 11 May 2011 01:34:44 +0000 (21:34 -0400)

Trivial merge