Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 29 Sep 2010 16:00:34 +0000 (12:00 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 29 Sep 2010 16:00:34 +0000 (12:00 -0400)

Trivial merge