Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 23 Jun 2011 21:42:48 +0000 (17:42 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 23 Jun 2011 21:42:48 +0000 (17:42 -0400)

Trivial merge