From 41ef90b0f9bee47b4dfabaf53626beaa7b39c255 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 17 Jun 2010 16:21:14 +0000
Subject: [PATCH] 3.0

git-svn-id: http://svn.automattic.com/wordpress/branches/3.0@15273 1a063a9b-81f0-0310-95a4-ce76da25c4cd