Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 01:56:51 +0000 (19:56 -0600)

Trivial merge