SVN_MERGE Merged revisions 1001354 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
................
r1001354 | winterz | 2009-07-23 01:47:36 +0200 (Thu, 23 Jul 2009) | 20 lines Merged revisions 1001350 via svnmerge from https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim ........ r1001350 | winterz | 2009-07-22 19:34:04 -0400 (Wed, 22 Jul 2009) | 14 lines A better fix for dealing with invalid attendee status strings in Kolab. If the status is not one of the 5 valid strings, then make the internal setting Attendee::None. Once the internal setting Attendee::None is written back to the server, it will become needs-action. In no case is an invalid status string written back to the server. hopefully fixes kolab/issue3766 MERGE: e4,trunk DO_NOT_BACKPORT: 4.3 (new i18n string) ........
................
svn path=/trunk/KDE/kdepimlibs/; revision=1004647