From cf567481287dd6ba12e76287630ae613f56a68ce Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 23 Sep 2010 21:13:34 +0000
Subject: [PATCH] Blocking r1386 from merge. The changes were copied to the
 trunk manually due to numerous conflicts with the branch version.