0cb56e2 Merge remote branch 'origin/master' into el6

Merged and Committed by robert 13 years ago
    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	openvpn.spec
    	sources
    
        
file modified
+8 -2
file modified
+14 -2
file modified
+2 -2