@@ -1,32 +1,12 @@
 BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
-END:STANDARD
-END:VTIMEZONE
 BEGIN:VEVENT
 SUMMARY:phone meeting
 DESCRIPTION:let's talk
 CATEGORIES:MEETING
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
- 20060406T163000
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
- 20060406T160000
+DTEND:20060406T163000
+DTSTART:20060406T160000
 UID:20060406T211449Z-4562-727-1-63@gollum
 DTSTAMP:20060406T211449Z
 LAST-MODIFIED:20060416T203532Z
@@ -44,8 +24,8 @@
 BEGIN:VEVENT
 UID:20060416T203656Z-4272-727-1-241@gollum
 DTSTAMP:20060416T203656Z
-DTSTART:20060406T170000Z
-DTEND:20060406T173000Z
+DTSTART:20060406T190000
+DTEND:20060406T193000
 TRANSP:OPAQUE
 SEQUENCE:3
 SUMMARY:recurrence weekly\, limited
@@ -53,7 +33,7 @@
 CLASS:PUBLIC
 CREATED:20060416T203724Z
 LAST-MODIFIED:20060416T203758Z
-RRULE:FREQ=WEEKLY;UNTIL=20060427T173000Z;INTERVAL=1;BYDAY=TH
+RRULE:FREQ=WEEKLY;UNTIL=20060427T190000;INTERVAL=1;BYDAY=TH
 END:VEVENT
 END:VCALENDAR
 
@@ -63,8 +43,8 @@
 BEGIN:VEVENT
 UID:20060416T203551Z-4272-727-1-240@gollum
 DTSTAMP:20060416T203551Z
-DTSTART:20060406T163000Z
-DTEND:20060406T170000Z
+DTSTART:20060406T183000
+DTEND:20060406T190000
 TRANSP:OPAQUE
 SEQUENCE:3
 SUMMARY:recurrence daily unlimited
@@ -81,8 +61,8 @@
 BEGIN:VEVENT
 UID:20060416T203813Z-4272-727-1-242@gollum
 DTSTAMP:20060416T203813Z
-DTSTART:20060406T173000Z
-DTEND:20060406T180000Z
+DTSTART:20060406T193000
+DTEND:20060406T200000
 TRANSP:OPAQUE
 SEQUENCE:3
 SUMMARY:recurrence monthly\, 6th day\, limited
@@ -90,7 +70,7 @@
 CLASS:PUBLIC
 CREATED:20060416T203924Z
 LAST-MODIFIED:20060416T203949Z
-RRULE:FREQ=MONTHLY;INTERVAL=1;UNTIL=20060606T173000Z
+RRULE:FREQ=MONTHLY;INTERVAL=1;UNTIL=20060606T193000
 END:VEVENT
 END:VCALENDAR
 
@@ -100,13 +80,13 @@
 BEGIN:VEVENT
 UID:20060416T203954Z-4272-727-1-243@gollum
 DTSTAMP:20060416T203954Z
-DTSTART:20060406T180000Z
-DTEND:20060406T183000Z
+DTSTART:20060406T200000
+DTEND:20060406T203000
 TRANSP:OPAQUE
 SEQUENCE:2
 SUMMARY:recurrence\, yearly\, two times
 CLASS:PUBLIC
-RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20070406T180000Z
+RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20070406T200000
 CREATED:20060416T204021Z
 LAST-MODIFIED:20060416T204021Z
 END:VEVENT
@@ -152,17 +132,17 @@
 BEGIN:VEVENT
 UID:20060416T204647Z-4272-727-1-248@gollum
 DTSTAMP:20060416T204647Z
-DTSTART:20060406T183000Z
-DTEND:20060406T190000Z
+DTSTART:20060406T203000
+DTEND:20060406T210000
 TRANSP:OPAQUE
 SEQUENCE:2
 SUMMARY:recurrence\, daily\, with exceptions
 DESCRIPTION:recurrs seven times\, excluding (but counting) Friday and 
  Saturday
 CLASS:PUBLIC
-RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
-EXDATE:20060408T183000Z
-EXDATE:20060407T183000Z
+RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T203000
+EXDATE:20060408T203000
+EXDATE:20060407T203000
 CREATED:20060416T204808Z
 LAST-MODIFIED:20060416T204808Z
 END:VEVENT
@@ -196,8 +176,8 @@
 BEGIN:VEVENT
 UID:20060416T204136Z-4272-727-1-247@gollum
 DTSTAMP:20060416T204136Z
-DTSTART:20060406T190000Z
-DTEND:20060406T193000Z
+DTSTART:20060406T210000
+DTEND:20060406T213000
 TRANSP:TRANSPARENT
 SEQUENCE:4
 SUMMARY:all fields
@@ -211,7 +191,7 @@
  characters:\na-umlaut ä\nexclamation mark !\nampersand disabled\nhash 
  #\nleft angle bracket disabled\nright angle bracket disabled\nleft square 
  bracket [\nright square bracket ]\nleft bracket (\nright bracket 
- )\nbackslash \\\nbackslash lf \\n\nbackslash cr \\r\nstar *\ncarret 
+ )\nbackslash \\\nbackslash lf \n\nbackslash cr \nstar *\ncarret 
  ^\npercent %\ntilde ~\ntick `\nbacktick `\ndouble quotation - not tested 
  because Evolution encodes it incorrectly\nsingle quotation '\ncolon :\n
  semicolon \;\ncomma \,\n
@@ -230,11 +210,11 @@
 BEGIN:VEVENT
 UID:20060416T204922Z-4272-727-1-250@gollum
 DTSTAMP:20060416T204922Z
-DTSTART:20060406T193000Z
-DTEND:20060406T200000Z
+DTSTART:20060406T213000
+DTEND:20060406T220000
 TRANSP:OPAQUE
 SEQUENCE:2
-CATEGORIES:BUSINESS,MEETING
+CATEGORIES:Business,MEETING
 SUMMARY:meeting invitation
 CLASS:PUBLIC
 ORGANIZER;CN=Patrick Ohly:MAILTO:Patrick.Ohly@gmx.de
@@ -253,14 +233,16 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50@gollum
 DTSTAMP:20080407T193125Z
-DTSTART:20080406T090000Z
-DTEND:20080406T093000Z
+DTSTART:20080406T110000
+DTEND:20080406T113000
 TRANSP:OPAQUE
 SEQUENCE:2
 SUMMARY:Recurring
 DESCRIPTION:recurs each Sonday\, 10 times
 CLASS:PUBLIC
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU;UNTIL=20080608T090000Z
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU;UNTIL=20080608T110000
+EXDATE:20080413T110000
+EXDATE:20080420T110000
 CREATED:20080407T193241Z
 LAST-MODIFIED:20080407T193241
 END:VEVENT
@@ -272,15 +254,15 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50@gollum
 DTSTAMP:20080407T193125Z
-DTSTART:20080413T090000Z
-DTEND:20080413T093000Z
+DTSTART:20080413T110000
+DTEND:20080413T113000
 TRANSP:OPAQUE
 SEQUENCE:7
 SUMMARY:Recurring: Modified
 CLASS:PUBLIC
 CREATED:20080407T193241Z
 LAST-MODIFIED:20080407T193647
-RECURRENCE-ID:20080413T090000Z
+RECURRENCE-ID:20080413T110000
 DESCRIPTION:second instance modified
 END:VEVENT
 END:VCALENDAR
@@ -291,15 +273,15 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50@gollum
 DTSTAMP:20080407T193125Z
-DTSTART:20080420T100000Z
-DTEND:20080420T103000Z
+DTSTART:20080420T120000
+DTEND:20080420T123000
 TRANSP:OPAQUE
 SEQUENCE:7
 SUMMARY:Recurring: Modified II
 CLASS:PUBLIC
 CREATED:20080407T193241Z
 LAST-MODIFIED:20080407T193647
-RECURRENCE-ID:20080420T090000Z
+RECURRENCE-ID:20080420T110000
 DESCRIPTION:third instance modified\, different time
 END:VEVENT
 END:VCALENDAR
@@ -310,14 +292,15 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50-XX@gollum
 DTSTAMP:20080407T193125Z
-DTSTART:20080406T090000Z
-DTEND:20080406T093000Z
+DTSTART:20080406T110000
+DTEND:20080406T113000
 TRANSP:OPAQUE
 SEQUENCE:2
 SUMMARY:Recurring 2
 DESCRIPTION:recurs each Sunday\, 10 times
 CLASS:PUBLIC
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU;UNTIL=20080608T090000Z
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU;UNTIL=20080608T110000
+EXDATE;VALUE=DATE:20080413T110000
 CREATED:20080407T193241Z
 LAST-MODIFIED:20080407T193241
 END:VEVENT
@@ -329,8 +312,8 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50-XX@gollum
 DTSTAMP:20080407T193125Z
-DTSTART:20080413T090000Z
-DTEND:20080413T093000Z
+DTSTART:20080413T110000
+DTEND:20080413T113000
 TRANSP:OPAQUE
 SEQUENCE:7
 SUMMARY:Recurring 2: Modified
@@ -348,8 +331,8 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50-YY@gollum
 DTSTAMP:20080407T193125Z
-DTSTART:20080413T090000Z
-DTEND:20080413T093000Z
+DTSTART:20080413T110000
+DTEND:20080413T113000
 TRANSP:OPAQUE
 SEQUENCE:7
 SUMMARY:Recurring 3: Modified
@@ -367,8 +350,8 @@
 BEGIN:VEVENT
 UID:20080407T193125Z-19554-727-1-50-YY@gollum
 DTSTAMP:20080407T193125Z
-DTSTART:20080420T100000Z
-DTEND:20080420T103000Z
+DTSTART:20080420T120000
+DTEND:20080420T123000
 TRANSP:OPAQUE
 SEQUENCE:7
 SUMMARY:Recurring 3: Modified II
@@ -383,28 +366,11 @@
 BEGIN:VCALENDAR
 PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:EST/EDT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19671029T020000
-RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19870405T020000
-RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=1SU
-END:DAYLIGHT
-END:VTIMEZONE
 BEGIN:VEVENT
 UID:20060416T205224Z-4272-727-1-251@gollum
 DTSTAMP:20060416T205224Z
-DTSTART;TZID=EST/EDT:20060406T140000
-DTEND;TZID=EST/EDT:20060406T143000
+DTSTART:20060406T200000
+DTEND:20060406T203000
 TRANSP:OPAQUE
 SEQUENCE:2
 SUMMARY:timezone New York with custom definition for 2006
