Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 14:36:46 +0000 (10:36 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 14:36:46 +0000 (10:36 -0400)

Trivial merge