5c210b Merge branch 'f16' into f17

Merged and Committed by Jan Safranek 12 years ago
    Merge branch 'f16' into f17
    
    Conflicts:
    	.gitignore
    	sources
    	wireshark.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+6 -1