a9ea624 Merge branch 'f20' into f21

Merged and Committed by Timothy St. Clair 9 years ago
    Merge branch 'f20' into f21
    
    Conflicts:
    	zookeeper.spec
    
        
file modified
+3 -29
file modified
+9 -2
file modified
+14 -6