Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 28 Dec 2007 21:15:23 +0000 (16:15 -0500)
committerJoey Hess <joey@kitenet.net>
Fri, 28 Dec 2007 21:15:23 +0000 (16:15 -0500)

Trivial merge