From bd890d4e53e2c5ab0ce7589ccf2270bb4878c90f Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 25 Jul 2011 20:06:50 +0000
Subject: [PATCH] Record-only merge of r8795 from maint-rel-vivo-1.3