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