Merged from jdong; lots of escaping fixes
authorJohn Dong <jdong@mit.edu>
Mon, 20 Aug 2007 21:32:57 +0000 (17:32 -0400)
committerJohn Dong <jdong@mit.edu>
Mon, 20 Aug 2007 21:32:57 +0000 (17:32 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?