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