Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 22 Jan 2011 14:23:29 +0000 (10:23 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 22 Jan 2011 14:23:29 +0000 (10:23 -0400)

Trivial merge