da1dfad Merge remote branch 'origin/master' into f13/master

Merged and Committed by rdieter 13 years ago
    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	soprano.spec
    	sources
    
        
file modified
+3 -1
file modified
+57 -20
file modified
+1 -1