Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 4 Mar 2009 18:51:55 +0000 (13:51 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 4 Mar 2009 18:51:55 +0000 (13:51 -0500)

Trivial merge