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

Trivial merge