Initial merge working. Removal of registration and email verification needed. Lots of other cleanup needed
Authored by: jhampton 2009-04-01
Parent: [r8015]
Child: [r8017]