Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 7 Feb 2012 13:33:32 +0000 (08:33 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 7 Feb 2012 13:33:32 +0000 (08:33 -0500)

Trivial merge