Merging in Ryan Tenney's 'improuvements'

This commit is contained in:
Jeremy Ashkenas
2010-10-06 10:55:19 -04:00
parent 18e85b813f
commit 0fb9a95182

File diff suppressed because one or more lines are too long