8155c64 Backport some fixes from the stable gnome-3-6 branch

Authored and Committed by Cosimo Cecchi 11 years ago
    Backport some fixes from the stable gnome-3-6 branch
    
        
file modified
+16 -1