258596c Merge branch 'f22' into f21

Merged and Committed by Flavio Leitner 9 years ago
    Merge branch 'f22' into f21
    
    Conflicts:
    	.gitignore
    	openvswitch.spec
    	sources
    
        
file modified
+1 -0
file modified
+12 -5
file modified
+1 -1