Commit 5360ce0c5c33f921b3f9ad3f42529a19df5ad0fe

Behdad Esfahbod 2010-10-07T21:21:11

Move some more code around