339235 trunk: 5 patches from dan.

Authored and Committed by Chris PeBenito 15 years ago
    trunk: 5 patches from dan.
    
        
file modified
+1 -0
file modified
+3 -1
file modified
+55 -8