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

Trivial merge