Commit d2ba016ca1ba7489537768b619980d5159b5870c

Behdad Esfahbod 2010-10-12T15:35:45

More refactoring