From 7aeb0ab4019e4141e2e03851dc1ddee9e0cf1019 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 21 Feb 2011 18:02:28 +0000
Subject: [PATCH] Record-only merge of r2693 from rel-1.2-maint