Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 13 Aug 2010 21:59:51 +0000 (17:59 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 13 Aug 2010 21:59:51 +0000 (17:59 -0400)

Trivial merge