6cfb7e1 Merge remote-tracking branch 'origin/f17' into f16

Merged and Committed by rdieter 12 years ago
    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kalzium.spec
    	sources
    
        
file modified
+1 -0
file modified
+30 -5
file modified
+1 -1