Merge remote branch 'remotes/gullydwarf-cfdv/b404_v3_edit_profile_submit_fail'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 9 Jul 2011 14:30:43 +0000 (09:30 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 9 Jul 2011 14:30:43 +0000 (09:30 -0500)

Trivial merge