Merge remote-tracking branch 'origin/KDE/4.9'

Conflicts:
akregator/configuration/akregator_config_advanced.desktop
akregator/configuration/akregator_config_appearance.desktop
akregator/configuration/akregator_config_archive.desktop
akregator/configuration/akregator_config_browser.desktop
akregator/configuration/akregator_config_general.desktop
akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop
kleopatra/conf/kleopatra_config_gnupgsystem.desktop
kleopatra/conf/kleopatra_config_smimevalidation.desktop
korganizer/kcmconfigs/korganizer_configcolorsandfonts.desktop
korganizer/kcmconfigs/korganizer_configdesignerfields.desktop
korganizer/kcmconfigs/korganizer_configfreebusy.desktop
korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop
korganizer/kcmconfigs/korganizer_configmain.desktop
korganizer/kcmconfigs/korganizer_configplugins.desktop
libkdepim/ldap/kcmldap.desktop