git-svn-id: http://svn.automattic.com/wordpress/trunk@8035 1a063a9b-81f0-0310-95a4-ce76da25c4cd
git-svn-id: http://svn.automattic.com/wordpress/trunk@7854 1a063a9b-81f0-0310-95a4-ce76da25c4cd