Merge branch 'master' of git://github.com/joeyh/ikiwiki
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 00:24:42 +0000 (19:24 -0500)
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>
Fri, 4 Sep 2009 00:24:42 +0000 (19:24 -0500)

Trivial merge