Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:42:20 +0000 (19:42 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:42:20 +0000 (19:42 -0400)

Trivial merge