Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 21:24:50 +0000 (17:24 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 21:24:50 +0000 (17:24 -0400)

Trivial merge