Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 14 Feb 2008 20:42:50 +0000 (15:42 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 14 Feb 2008 20:42:50 +0000 (15:42 -0500)

Trivial merge