33349b
Merge remote-tracking branch 'origin/master' into f14 Conflicts: .gitignore akonadi.spec sources