Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Wed, 15 Feb 2012 06:14:37 +0000 (22:14 -0800)
committerMatt McCutchen <matt@mattmccutchen.net>
Wed, 15 Feb 2012 06:14:37 +0000 (22:14 -0800)

Trivial merge