Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 18 Apr 2011 00:59:28 +0000 (20:59 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 18 Apr 2011 00:59:28 +0000 (20:59 -0400)

Trivial merge