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

Trivial merge