33349b Merge remote-tracking branch 'origin/master' into f14

Merged and Committed by Rex Dieter 13 years ago
    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	akonadi.spec
    	sources
    
        
file modified
+1 -2
file removed
-15
file modified
+48 -30
file modified
+1 -1