972c005 Merge branch 'master' into el6/master

Merged and Committed by peter 13 years ago
    Merge branch 'master' into el6/master
    
    Conflicts:
    	.gitignore
    	couchdb.spec
    	sources
    
        
file modified
+1 -0
file modified
+13 -10
file modified
+1 -1