Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 5 Feb 2012 06:28:01 +0000 (01:28 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sun, 5 Feb 2012 06:28:01 +0000 (01:28 -0500)

Trivial merge