ddd6946 Merge branch 'master' into f17

Merged and Committed by Stanislav Ochotnicky 12 years ago
    Merge branch 'master' into f17
    
    Should be the same really
    
    Conflicts:
    	antlr3.spec
    
        
file removed
-133
file modified
+95 -92