Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 12 Sep 2010 22:53:40 +0000 (18:53 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 12 Sep 2010 22:53:40 +0000 (18:53 -0400)

Trivial merge