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