Merge branch '1.0.x', getting fix for bug 480
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 23:31:41 +0000 (18:31 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 23:31:41 +0000 (18:31 -0500)

Trivial merge