Merge branch '1.0.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 15 Feb 2013 21:43:30 +0000 (16:43 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 15 Feb 2013 21:43:30 +0000 (16:43 -0500)

Trivial merge