Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 15 Mar 2013 16:34:58 +0000 (12:34 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 15 Mar 2013 16:34:58 +0000 (12:34 -0400)

Trivial merge