Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 28 Jan 2013 16:53:01 +0000 (11:53 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 28 Jan 2013 16:53:01 +0000 (11:53 -0500)

Trivial merge