Merged revisions 974128,974676,974684,974859 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r974128 | winterz | 2009-05-28 16:40:31 +0200 (Thu, 28 May 2009) | 3 lines use the "view-pim-calendar" icon instead of the non-existant "cookie" icon. MERGE: trunk,4.2
........
r974676 | winterz | 2009-05-29 19:15:20 +0200 (Fri, 29 May 2009) | 5 lines use Oxygen icons "view-pim-foo" instead of non-existant icons "kmgroupware_folder_foo" to represent calendar, contacts, and tasks. MERGE: trunk
........
r974684 | winterz | 2009-05-29 19:18:04 +0200 (Fri, 29 May 2009) | 6 lines for consistency, use icons "view-pim-contacts" instead of "text-directory" for groupware contact "view-pim-calendar" instead of "text-calendar" for groupware calendar MERGE: trunk
........
r974859 | winterz | 2009-05-29 20:08:17 +0200 (Fri, 29 May 2009) | 7 lines copy the Oxygen icon "mail-receive" here to use instead of the non-existant "mail-download-now" and "mail-download-later" icons. we can remove these local temporary copies once real icons for these purposes exist. MERGE: trunk
........
svn path=/trunk/KDE/kdepim/kontact/plugins/; revision=977054