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

Trivial merge