Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 22 Jan 2013 17:29:01 +0000 (12:29 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 22 Jan 2013 17:29:01 +0000 (12:29 -0500)

Trivial merge