Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 19 Apr 2010 20:04:49 +0000 (16:04 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 19 Apr 2010 20:04:49 +0000 (16:04 -0400)

Trivial merge