Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 31 Aug 2010 18:30:00 +0000 (14:30 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 31 Aug 2010 18:30:00 +0000 (14:30 -0400)

Trivial merge