0c6ac10 Merge remote-tracking branch 'origin/f19'

Merged and Committed by kalev 11 years ago
    Merge remote-tracking branch 'origin/f19'
    
    Conflicts:
    	speech-dispatcher.spec
    
        
file modified
+10 -5