Merge remote branch 'remotes/gullydwarf-cfdv/b429_fix_edit_profile_form_validation'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:35:19 +0000 (22:35 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:35:19 +0000 (22:35 -0500)

Trivial merge