From 62dc70191308e9a29891d484ae4ca00b92c6f1f1 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 3 Sep 2010 21:27:31 +0000
Subject: [PATCH] Block merge of r1335 from rel-1.1.-maint