From 50e7e2099fdd4f7673efcae16fadb8657a3bf52d Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 26 Apr 2011 16:39:18 +0000
Subject: [PATCH] Record-only merge of r7882, r7883, and r7887 on
 nihvivo-rel-1.2-maint: updates have or will be made manually on trunk.