Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 21 May 2010 17:47:18 +0000 (13:47 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 21 May 2010 17:47:18 +0000 (13:47 -0400)

Trivial merge