c622cec Merge branch 'master' into f17

Merged and Committed by rdieter 12 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	kmymoney.spec
    
        
file modified
+1 -0
file modified
+6 -8
file modified
+1 -1