Merge branch 'master' into wip-particles
authorAndy Wingo <wingo@pobox.com>
Fri, 15 Feb 2013 20:25:30 +0000 (21:25 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 15 Feb 2013 20:25:30 +0000 (21:25 +0100)

Trivial merge