Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 29 Aug 2010 00:21:10 +0000 (20:21 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 29 Aug 2010 00:21:10 +0000 (20:21 -0400)

Trivial merge