f8e70dc Merge remote-tracking branch 'origin/master' into el6

Merged and Committed by Kaleb KEITHLEY 12 years ago
    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	glusterfs.spec
    	sources
    
        
file modified
+4 -0
file added
+13
file modified
+158 -72
file added
+12
file modified
+1 -1