2e8a67f Apply clean up merge git patch from Dominick Grift

Authored and Committed by mgrepl 12 years ago
    Apply clean up merge git patch from Dominick Grift
    
        
file modified
+4 -20
file modified
+32 -79
file modified
+32 -191