Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 6 Jan 2009 02:27:50 +0000 (21:27 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 6 Jan 2009 02:27:50 +0000 (21:27 -0500)

Trivial merge