Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 10 Dec 2007 20:14:07 +0000 (15:14 -0500)
committerJoey Hess <joey@kitenet.net>
Mon, 10 Dec 2007 20:14:07 +0000 (15:14 -0500)

Trivial merge