git-svn-id: http://svn.automattic.com/wordpress/tags/3.0.6@17715 1a063a9b-81f0-0310-95a4-ce76da25c4cd