a6b2023 Merge 2.4.4 changes.

Merged and Committed by jorton 11 years ago
    Merge 2.4.4 changes.
    
        
file modified
+1 -1
file added
+6
file modified
+24 -2