Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Mon, 13 Feb 2012 01:27:34 +0000 (17:27 -0800)
committerMatt McCutchen <matt@mattmccutchen.net>
Mon, 13 Feb 2012 01:27:34 +0000 (17:27 -0800)

Trivial merge