9ccd77d Merge branch 'master' into el6

Merged and Committed by jgu 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	djvulibre.spec
    	sources
    
        
file modified
+3 -1
file modified
+53 -51
file modified
+2 -1