From af968e3000d529e6363dc2ca649b9c536614e042 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 25 Jul 2011 16:05:31 +0000
Subject: [PATCH] Record-only merge of r8826-8827 from maint-rel-vivo-1.3