Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 18 Sep 2010 16:58:41 +0000 (12:58 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 18 Sep 2010 16:58:41 +0000 (12:58 -0400)

Trivial merge