From c7024c37bc13ddd1ecc1f10395c8c07a96bdf60b Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 30 Sep 2010 20:11:26 +0000
Subject: [PATCH] Block r5991, r5994 on nihvivo-rel-1.1-maint from being merged
 to trunk. Same changes have been made manually on trunk.