Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 23:36:16 +0000 (18:36 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 23:36:16 +0000 (18:36 -0500)

Trivial merge