4749afe Sync with f18

Authored and Committed by Jiri Vanek 11 years ago
    Sync with f18
    
        
file modified
+2 -2
file added
+139
file modified
+16 -1
file modified
+1 -1