Merge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 22:46:26 +0000 (17:46 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 22:46:26 +0000 (17:46 -0500)

Trivial merge