Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Wed, 15 Feb 2012 05:38:53 +0000 (21:38 -0800)
committerMatt McCutchen <matt@mattmccutchen.net>
Wed, 15 Feb 2012 05:38:53 +0000 (21:38 -0800)

Trivial merge