Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 7 Jul 2010 17:58:19 +0000 (13:58 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 7 Jul 2010 17:58:19 +0000 (13:58 -0400)

Trivial merge