Commit 428dfcab6634ff264570a0a5d715efb8048c3db5

Behdad Esfahbod 2012-08-07T16:51:48

Minor refactoring