From bba244d85210fa3e0c7a05f53945bbb21b804a95 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 6 Oct 2010 21:39:05 +0000
Subject: [PATCH] merge 5993 from nihvivo-rel-1.1-maint to trunk