Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 14 Jun 2010 18:11:35 +0000 (14:11 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 14 Jun 2010 18:11:35 +0000 (14:11 -0400)

Trivial merge