Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 4 Feb 2013 18:53:16 +0000 (13:53 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 4 Feb 2013 18:53:16 +0000 (13:53 -0500)

Trivial merge