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

Trivial merge