Merge branch '1.2.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 19 Jun 2013 22:28:38 +0000 (18:28 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 19 Jun 2013 22:28:38 +0000 (18:28 -0400)

Trivial merge