Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 17 Jun 2010 20:52:33 +0000 (16:52 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Jun 2010 20:52:33 +0000 (16:52 -0400)

Trivial merge