Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 1 Mar 2013 23:28:22 +0000 (18:28 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 1 Mar 2013 23:28:22 +0000 (18:28 -0500)

Trivial merge