From 74daa5fd586d477b0390a3498909600b72afaaa5 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 3 Sep 2010 21:54:14 +0000
Subject: [PATCH] Block merge of r1339 from rel-1.1-maint