git-svn-id: http://core.svn.wordpress.org/trunk@21980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
git-svn-id: http://svn.automattic.com/wordpress/trunk@20138 1a063a9b-81f0-0310-95a4-ce76da25c4cd