From e670c805af0f8eb95fc3bcdbbc41d1003d8eacd6 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sat, 15 Jan 2011 05:25:55 +0000
Subject: [PATCH] Record-only merge of r2197-r2198 from rel-1.2-maint branch