Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 2 May 2010 19:45:48 +0000 (15:45 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 2 May 2010 19:45:48 +0000 (15:45 -0400)

Trivial merge