Commit bf94b3ad22b2fe4730d4e64d673c63154fc5b5fe

Behdad Esfahbod 2010-10-27T22:37:59

Move some more code around