Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 26 Nov 2007 19:19:10 +0000 (14:19 -0500)
committerJoey Hess <joey@kitenet.net>
Mon, 26 Nov 2007 19:19:10 +0000 (14:19 -0500)

Trivial merge