Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:31:36 +0000 (16:31 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Apr 2011 20:31:36 +0000 (16:31 -0400)

Trivial merge