Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 16 Nov 2007 17:53:34 +0000 (12:53 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 16 Nov 2007 17:53:34 +0000 (12:53 -0500)

Trivial merge