Updated to 2.61 from http://plugins.svn.wordpress.org/wp-email/trunk/
Merge branch '2.61'