git-svn-id: http://core.svn.wordpress.org/tags/3.4.1@21156 1a063a9b-81f0-0310-95a4-ce76da25c4cd