a994b3a Merge branch 'master' into f17

Merged and Committed by Stanislav Ochotnicky 12 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	velocity.spec
    
        
file modified
+14 -26