Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Sun, 12 Feb 2012 18:11:32 +0000 (10:11 -0800)
committerMatt McCutchen <matt@mattmccutchen.net>
Sun, 12 Feb 2012 18:11:32 +0000 (10:11 -0800)

Trivial merge