From e187afe2009261a48a14153f7b614f907d195cf4 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 31 May 2011 15:07:55 +0000
Subject: [PATCH] Record-only merge of r2867 and r2822; these changes were made
 independently on the trunk.