Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
akregator/src/akregator.notifyrc
importwizard/importwizard.desktop
kmail/kmail2.notifyrc
kontact/plugins/kmail/kcmkmailsummary.desktop
mailfilteragent/akonadi_mailfilter_agent.notifyrc