853e237 Merge branch 'master' into f17 so they have the same history.

Merged and Committed by jsynacek 12 years ago
    Merge branch 'master' into f17 so they have the same history.
    
        
file modified
+4 -1
file modified
+1 -1