420c7f0 Merge branch 'master' into f13

Merged and Committed by awjb 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	librapi.spec
    	sources
    
        
file modified
+1 -1
file modified
+12 -5
file modified
+1 -1