From ff5c63151c1161fcddc06449f9a56529477df4ed Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 19 Apr 2011 16:13:12 +0000
Subject: [PATCH] Record-only merge of r7792 from nihvivo-rel-1.2-maint branch.
 Same changes have been made independently on the trunk.