Commit 0f8881d6bbf6cd59938315eeff9b71cfc736aa4e

Behdad Esfahbod 2012-08-07T16:57:02

More refactoring