Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 19 Nov 2008 22:31:17 +0000 (17:31 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 19 Nov 2008 22:31:17 +0000 (17:31 -0500)

Trivial merge