3a8d9ca Merge commit '38ea3e9999aff478d05f59c739bc593bc97e2791'

Merged and Committed by adamwill 12 years ago
    Merge commit '38ea3e9999aff478d05f59c739bc593bc97e2791'
    
    Conflicts:
    	.gitignore
    	NetworkManager.spec
    
        
file modified
+2 -0
file modified
+6 -2