6a5a69e Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	nautilus.spec
    	sources
    
        
file modified
+6 -16
file modified
+29 -9
file modified
+1 -1