Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 7 Dec 2007 06:10:10 +0000 (01:10 -0500)
committerJoey Hess <joey@kitenet.net>
Fri, 7 Dec 2007 06:10:10 +0000 (01:10 -0500)

Trivial merge