481502b Merge remote branch 'origin/el6/master'

Merged and Committed by dwayne 13 years ago
    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	.gitignore
    	sources
    	translate-toolkit.spec
    
    Added a number of %{?fedora} and rhel to allow the spec to be portable
    between distro's
    
        
file modified
+25 -7