From 683234974e7026eeafd7a59109fb676b2016d947 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 8 Apr 2011 20:28:52 +0000
Subject: [PATCH] Record-only merge of r7769 and r7770 from
 nihvivo-rel-1.2-maint branch