From d8789cfc67763c9c2299038f95d773b1341dceae Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 8 Sep 2010 13:47:56 +0000
Subject: [PATCH] Block merge of r1342, r1344 from rel-1.1-maint. Changes have
 been applied manually to the trunk.