diff --git a/testing/tests/regression-suite/800-Spec-LOCK-1.result b/testing/tests/regression-suite/800-Spec-LOCK-1.result
index efdfc82a..14e8c4c7 100644
--- a/testing/tests/regression-suite/800-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/800-Spec-LOCK-1.result
@@ -2,12 +2,12 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
-Content-Length: 473
+Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <prop xmlns="DAV:">
- <lockdiscovery xmlns="DAV:">
+ <lockdiscovery>
   <activelock>
    <locktype>
     <write/>
diff --git a/testing/tests/regression-suite/801-Spec-LOCK-1.result b/testing/tests/regression-suite/801-Spec-LOCK-1.result
index 6ded8513..37ba378a 100644
--- a/testing/tests/regression-suite/801-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/801-Spec-LOCK-1.result
@@ -1,12 +1,12 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-Content-Length: 473
+Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <prop xmlns="DAV:">
- <lockdiscovery xmlns="DAV:">
+ <lockdiscovery>
   <activelock>
    <locktype>
     <write/>
diff --git a/testing/tests/regression-suite/803-Mulberry-PUT-1.result b/testing/tests/regression-suite/803-Mulberry-PUT-1.result
index f4b19692..78eb6672 100644
--- a/testing/tests/regression-suite/803-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/803-Mulberry-PUT-1.result
@@ -1,3 +1,5 @@
+HTTP/1.1 100 Continue
+
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
@@ -11,3 +13,6 @@ Content-Type: text/xml; charset="utf-8"
   <status>HTTP/1.1 423 Resource Locked</status>
  </response>
 </multistatus>
+            count: >0<
+           prompt: >Should be 0<
+
diff --git a/testing/tests/regression-suite/803-Mulberry-PUT-1.test b/testing/tests/regression-suite/803-Mulberry-PUT-1.test
index f4b7d2ff..cd1d535e 100644
--- a/testing/tests/regression-suite/803-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/803-Mulberry-PUT-1.test
@@ -1,8 +1,57 @@
 #
-# Attempt to put this Mulberry event into a location that is locked.
+# Attempt to put this event into a location that is locked.
+#
 TYPE=PUT
 URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
-DATA=F56B49B10FC923D20FE2DC92D6580340-0.ics
+
+BEGINDATA
+BEGIN:VCALENDAR
+PRODID:-//Facebook//NONSGML Facebook Events V0.9//EN
+X-ORIGINAL-URL:http://www.facebook.com/event.php?eid=33142748183
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+BEGIN:VEVENT
+DTSTAMP:20081030T194443
+LAST-MODIFIED:20081030T194443
+CREATED:20081030T194401
+SEQUENCE:42
+ORGANIZER:MAILTO:sigurd@sliverstripe.com
+DTSTART:20081117T180000
+DTEND:20081117T210000
+UID:e33142748183@facebook.com
+SUMMARY:Wellington Meetup and v2.3 pre-release party
+LOCATION:Southern Cross Bar/Restaurant\, Cub
+ a St/Able Smith St intersection
+URL:http://www.facebook.com/event.php?eid=33142748183
+DESCRIPTION:Food\, alcohol\, code\, and websites.
+  What more do you want in life?\n\nW
+ e're interesting in meeting up wit
+ h the local web community and thos
+ e who use SilverStripe\, so that we
+  can listen to your ideas and answ
+ er your questions\, technical or ot
+ herwise.\n\nWe'll also be demonstrat
+ ing what's coming in SilverStripe 
+ v2.3\, and you get to meet the peop
+ le behind the code!\n\n\nhttp://www.f
+ acebook.com/event.php?eid=33142748
+ 183
+CLASS:PUBLIC
+CATEGORIES:
+STATUS:CONFIRMED
+PARTSTAT:ACCEPTED
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT 'Should be 0' AS prompt, count(*)
+  FROM caldav_data JOIN calendar_item USING(dav_name)
+  WHERE caldav_data.dav_name ~ '^/user1/home/i1278618276.ics'
+ENDQUERY
+
 
diff --git a/testing/tests/regression-suite/804-Mulberry-PUT-1.result b/testing/tests/regression-suite/804-Mulberry-PUT-1.result
index 036a02c7..04cc819e 100644
--- a/testing/tests/regression-suite/804-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/804-Mulberry-PUT-1.result
@@ -1,61 +1,76 @@
+HTTP/1.1 100 Continue
+
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "a8f2331f539bfb5ce52c464482196f85"
+ETag: "ad17bc2c8f60cf87de4a9eaa82312dea"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
    A1 CalDAV DATA: >BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+PRODID:-//Facebook//NONSGML Facebook Events V0.9//EN
+X-ORIGINAL-URL:http://www.facebook.com/event.php?eid=33142748183
 VERSION:2.0
-X-WR-CALNAME:home
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
 BEGIN:VEVENT
-DTSTAMP:20061025T101327Z
-DTSTART;TZID=New Zealand Standard Time:20061025T091500
-DURATION:PT1H
-SUMMARY:Check PUT works when we supply the correct lock token.
-UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+DTSTAMP:20081030T194443
+LAST-MODIFIED:20081030T194443
+CREATED:20081030T194401
+SEQUENCE:42
+ORGANIZER:MAILTO:sigurd@sliverstripe.com
+DTSTART:20081117T180000
+DTEND:20081117T210000
+UID:e33142748183@facebook.com
+SUMMARY:Wellington Meetup and v2.3 pre-release party
+LOCATION:Southern Cross Bar/Restaurant\, Cub
+ a St/Able Smith St intersection
+URL:http://www.facebook.com/event.php?eid=33142748183
+DESCRIPTION:Food\, alcohol\, code\, and websites.
+  What more do you want in life?\n\nW
+ e're interesting in meeting up wit
+ h the local web community and thos
+ e who use SilverStripe\, so that we
+  can listen to your ideas and answ
+ er your questions\, technical or ot
+ herwise.\n\nWe'll also be demonstrat
+ ing what's coming in SilverStripe 
+ v2.3\, and you get to meet the peop
+ le behind the code!\n\n\nhttp://www.f
+ acebook.com/event.php?eid=33142748
+ 183
+CLASS:PUBLIC
+CATEGORIES:
+STATUS:CONFIRMED
+PARTSTAT:ACCEPTED
 END:VEVENT
 END:VCALENDAR
 <
       caldav_type: >VEVENT<
             class: >PUBLIC<
-      description: >NULL<
-            dtend: >2006-10-25 10:15:00+13<
-          dtstamp: >2006-10-25 10:13:27<
-          dtstart: >2006-10-25 09:15:00+13<
+      description: >Food, alcohol, code, and websites. What more do you want in life?
+
+We're interesting in meeting up with the local web community and those who use SilverStripe, so that we can listen to your ideas and answer your questions, technical or otherwise.
+
+We'll also be demonstrating what's coming in SilverStripe v2.3, and you get to meet the people behind the code!
+
+
+http://www.facebook.com/event.php?eid=33142748183<
+            dtend: >2008-11-17 21:00:00+13<
+          dtstamp: >2008-10-30 19:44:43<
+          dtstart: >2008-11-17 18:00:00+13<
               due: >NULL<
-         location: >NULL<
+         location: >Southern Cross Bar/Restaurant, Cuba St/Able Smith St intersection<
       logged_user: >10<
  percent_complete: >NULL<
          priority: >NULL<
             rrule: >NULL<
-           status: >NULL<
-          summary: >Check PUT works when we supply the correct lock token.<
+           status: >CONFIRMED<
+          summary: >Wellington Meetup and v2.3 pre-release party<
            transp: >NULL<
-            tz_id: >New Zealand Standard Time<
-              uid: >B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C<
-              url: >NULL<
+            tz_id: >NULL<
+              uid: >e33142748183@facebook.com<
+              url: >http://www.facebook.com/event.php?eid=33142748183<
           user_no: >10<
-   ~ Modified Now: >1<
+   ~ Modified Now: >0<
 
diff --git a/testing/tests/regression-suite/804-Mulberry-PUT-1.test b/testing/tests/regression-suite/804-Mulberry-PUT-1.test
index 1c14a599..f51ce85b 100644
--- a/testing/tests/regression-suite/804-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/804-Mulberry-PUT-1.test
@@ -1,5 +1,5 @@
 #
-# Attempt to put this Mulberry event into a location that is locked.
+# Attempt to put this event into a location that is locked.
 #  - but this time supply the token so it succeeds
 #
 TYPE=PUT
@@ -17,35 +17,41 @@ HEAD
 
 BEGINDATA
 BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+PRODID:-//Facebook//NONSGML Facebook Events V0.9//EN
+X-ORIGINAL-URL:http://www.facebook.com/event.php?eid=33142748183
 VERSION:2.0
-X-WR-CALNAME:home
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
 BEGIN:VEVENT
-DTSTAMP:20061025T101327Z
-DTSTART;TZID=New Zealand Standard Time:20061025T091500
-DURATION:PT1H
-SUMMARY:Check PUT works when we supply the correct lock token.
-UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+DTSTAMP:20081030T194443
+LAST-MODIFIED:20081030T194443
+CREATED:20081030T194401
+SEQUENCE:42
+ORGANIZER:MAILTO:sigurd@sliverstripe.com
+DTSTART:20081117T180000
+DTEND:20081117T210000
+UID:e33142748183@facebook.com
+SUMMARY:Wellington Meetup and v2.3 pre-release party
+LOCATION:Southern Cross Bar/Restaurant\, Cub
+ a St/Able Smith St intersection
+URL:http://www.facebook.com/event.php?eid=33142748183
+DESCRIPTION:Food\, alcohol\, code\, and websites.
+  What more do you want in life?\n\nW
+ e're interesting in meeting up wit
+ h the local web community and thos
+ e who use SilverStripe\, so that we
+  can listen to your ideas and answ
+ er your questions\, technical or ot
+ herwise.\n\nWe'll also be demonstrat
+ ing what's coming in SilverStripe 
+ v2.3\, and you get to meet the peop
+ le behind the code!\n\n\nhttp://www.f
+ acebook.com/event.php?eid=33142748
+ 183
+CLASS:PUBLIC
+CATEGORIES:
+STATUS:CONFIRMED
+PARTSTAT:ACCEPTED
 END:VEVENT
 END:VCALENDAR
 ENDDATA
diff --git a/testing/tests/regression-suite/810-Spec-LOCK-1.result b/testing/tests/regression-suite/810-Spec-LOCK-1.result
index efdfc82a..14e8c4c7 100644
--- a/testing/tests/regression-suite/810-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/810-Spec-LOCK-1.result
@@ -2,12 +2,12 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
-Content-Length: 473
+Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <prop xmlns="DAV:">
- <lockdiscovery xmlns="DAV:">
+ <lockdiscovery>
   <activelock>
    <locktype>
     <write/>
diff --git a/testing/tests/regression-suite/811-Spec-LOCK-1.result b/testing/tests/regression-suite/811-Spec-LOCK-1.result
index 6ded8513..37ba378a 100644
--- a/testing/tests/regression-suite/811-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/811-Spec-LOCK-1.result
@@ -1,12 +1,12 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-Content-Length: 473
+Content-Length: 460
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <prop xmlns="DAV:">
- <lockdiscovery xmlns="DAV:">
+ <lockdiscovery>
   <activelock>
    <locktype>
     <write/>
diff --git a/testing/tests/regression-suite/901-GET-Collection.result b/testing/tests/regression-suite/901-GET-Collection.result
index f278c430..c5d6dcb4 100644
--- a/testing/tests/regression-suite/901-GET-Collection.result
+++ b/testing/tests/regression-suite/901-GET-Collection.result
@@ -1,12 +1,14 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-Content-Length: 9709
+Content-Length: 9698
+Etag: "8600dc4a1b264a09a5f741d710497cba"
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
 PRODID:-//davical.org//NONSGML AWL Calendar//EN
 VERSION:2.0
+CALSCALE:GREGORIAN
 X-WR-CALNAME:User One's Calendar
 BEGIN:VEVENT
 DTSTAMP:20061102T090217Z
@@ -228,8 +230,27 @@ DTSTART;TZID=Pacific/Auckland:20081121T160000
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR
 END:VEVENT
 BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
 BEGIN:STANDARD
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
@@ -264,6 +285,24 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
 BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
 TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
 X-LIC-LOCATION:Antarctica/McMurdo
 BEGIN:STANDARD
@@ -282,58 +321,20 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
 BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
 TZID:Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19700927T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9
-END:DAYLIGHT
 BEGIN:STANDARD
+DTSTART:20000319T030000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=3
+TZNAME:Pacific/Auckland
 TZOFFSETFROM:+1300
 TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700405T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
 END:STANDARD
 BEGIN:DAYLIGHT
+DTSTART:20001001T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:Pacific/Auckland
 TZOFFSETFROM:+1200
 TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/902-PUT-collection.test b/testing/tests/regression-suite/902-PUT-collection.test
index 75d169df..d1edab1b 100644
--- a/testing/tests/regression-suite/902-PUT-collection.test
+++ b/testing/tests/regression-suite/902-PUT-collection.test
@@ -246,6 +246,7 @@ END:VEVENT
 BEGIN:VEVENT
 UID:86203AFD481A6C42892013E6E0C4845D039A2543@AKEXBE02.telecom.tcnz.net
 DTSTAMP:20061005T230724Z
+DTSTART:20070120T093000
 SUMMARY:Reminder for Mark for Absolom Livasathan's PGP WF Services cost  
  request
 DESCRIPTION:From Absolom.Livasathan@example.com Fri Oct  6 12:00:02 2006\n
diff --git a/testing/tests/regression-suite/903-GET-Collection.result b/testing/tests/regression-suite/903-GET-Collection.result
index 9e600744..2faaf734 100644
--- a/testing/tests/regression-suite/903-GET-Collection.result
+++ b/testing/tests/regression-suite/903-GET-Collection.result
@@ -1,12 +1,14 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-Content-Length: 24484
+Content-Length: 24642
+Etag: "06663804d3bec5b85580d89056bcf54e"
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
 PRODID:-//davical.org//NONSGML AWL Calendar//EN
 VERSION:2.0
+CALSCALE:GREGORIAN
 X-WR-CALNAME:entire
 BEGIN:VEVENT
 UID:20061119T201927Z-5105-1000-5103-8@ubu
@@ -219,6 +221,7 @@ END:VEVENT
 BEGIN:VEVENT
 UID:86203AFD481A6C42892013E6E0C4845D039A2543@AKEXBE02.telecom.tcnz.net
 DTSTAMP:20061005T230724Z
+DTSTART:20070120T093000
 SUMMARY:Reminder for Mark for Absolom Livasathan's PGP WF Services cost  
  request
 DESCRIPTION:From Absolom.Livasathan@example.com Fri Oct  6 12:00:02 
@@ -614,24 +617,6 @@ TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
 END:VALARM
 END:VEVENT
 BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19700927T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700405T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
 TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
 X-LIC-LOCATION:Pacific/Auckland
 BEGIN:STANDARD
@@ -649,4 +634,28 @@ DTSTART:19701004T020000
 RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
+TZNAME:NZST
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+TZNAME:NZDT
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZNAME:NZST
+END:STANDARD
+END:VTIMEZONE
 END:VCALENDAR