Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 31 Jul 2010 19:55:31 +0000 (15:55 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 31 Jul 2010 19:55:31 +0000 (15:55 -0400)

Trivial merge