Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 27 Sep 2010 02:27:50 +0000 (22:27 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 27 Sep 2010 02:27:50 +0000 (22:27 -0400)

Trivial merge