Merge branch '1.0.x' (getting fix for bug 479)
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 22:56:53 +0000 (17:56 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 22:56:53 +0000 (17:56 -0500)

Trivial merge