3ade0f New upstream svn snapshot

Authored and Committed by sgrubb 9 years ago
    New upstream svn snapshot
    
        
file modified
+20 -8
file modified
+1 -1