d4bb132 - Merge in fixes from dgrift repository

Authored and Committed by dwalsh 13 years ago
    - Merge in fixes from dgrift repository
    
        
file modified
+4 -1