From 678400d544840ec882696237d334f551a6c69426 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 4 Jul 2011 20:22:37 +0000
Subject: [PATCH] Branching 3.2

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