Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 22 Sep 2010 21:50:26 +0000 (17:50 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 22 Sep 2010 21:50:26 +0000 (17:50 -0400)

Trivial merge