Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 15 Aug 2010 15:54:16 +0000 (11:54 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 15 Aug 2010 15:54:16 +0000 (11:54 -0400)

Trivial merge