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