3e388c2 sync with f21

Authored and Committed by Jiri Vanek 9 years ago
    sync with f21
    
        
file added
+153
file modified
+12 -6