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

Trivial merge