Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 5 Jul 2010 18:04:54 +0000 (14:04 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 5 Jul 2010 18:04:54 +0000 (14:04 -0400)

Trivial merge