[#1074] - Fixes for followup push
Authored by: Rick Copeland 2010-10-25
Parent(s): [4f0cf2]
Child(ren): [3656d1]