From f70aad23f60a079c343617f43b4de5c2851da2b8 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Sat, 15 Jan 2011 05:28:58 +0000
Subject: [PATCH] Record only merge of r7041 from nihvivo-rel-1.2-maint