From 8000070c777b75fbb5f6c41c00af5cff813c3ed1 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 6 Oct 2010 19:18:53 +0000
Subject: [PATCH] merging 5348 from nihvivo-rel-1.1-maint to trunk