3.0.2 update

git-svn-id: https://plugins.svn.wordpress.org/written/trunk@1011142 b8457f37-d9ea-0310-8a92-e5e31aec5664
3.0.2 update 2

git-svn-id: https://plugins.svn.wordpress.org/written/trunk@1011146 b8457f37-d9ea-0310-8a92-e5e31aec5664