Commit 650ac00da3d2f988197393f34d40f0ba1a0fa093

Behdad Esfahbod 2012-04-23T13:17:09

Minor refactoring