470c705 Updates from master branch.

Authored and Committed by slaanesh 11 years ago
    Updates from master branch.
    
        
file modified
+2 -2
file modified
+5 -1