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

Trivial merge