Merge branch '1.2.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 21 May 2013 20:34:29 +0000 (16:34 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 21 May 2013 20:34:29 +0000 (16:34 -0400)

Trivial merge