Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jan 2008 02:01:54 +0000 (21:01 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 9 Jan 2008 02:01:54 +0000 (21:01 -0500)

Trivial merge