Avoid to icon conflicts
Merge branch 'master' of git://anongit.kde.org/akonadi-google-applets