Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 19:25:40 +0000 (15:25 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Mar 2010 19:25:40 +0000 (15:25 -0400)

Trivial merge