diff --git a/testing/tests/regression-suite/502-iCal-PROPFIND.result b/testing/tests/regression-suite/502-iCal-PROPFIND.result
new file mode 100644
index 00000000..21dd3ab5
--- /dev/null
+++ b/testing/tests/regression-suite/502-iCal-PROPFIND.result
@@ -0,0 +1,50 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "fd1ab8da7166728112e8028466b371d4"
+Content-Length: 966
+Content-Type: text/xml; charset="utf-8"
+
+
+
+
+ /caldav.php/user1/
+
+
+
+
+
+
+ User_1
+
+ HTTP/1.1 200 OK
+
+
+
+
+
+
+ HTTP/1.1 404 Not Found
+
+
+
+ /caldav.php/user1/home/
+
+
+
+
+
+
+ home
+
+ HTTP/1.1 200 OK
+
+
+
+
+
+
+ HTTP/1.1 404 Not Found
+
+
+
diff --git a/testing/tests/regression-suite/502-iCal-PROPFIND.test b/testing/tests/regression-suite/502-iCal-PROPFIND.test
new file mode 100644
index 00000000..98ba7a33
--- /dev/null
+++ b/testing/tests/regression-suite/502-iCal-PROPFIND.test
@@ -0,0 +1,22 @@
+#
+# Testing with a process similar to iCal 10.5
+#
+TYPE=PROPFIND
+URL=http://mycaldav/caldav.php/user1/
+HEAD
+
+HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+BEGINDATA
+
+
+
+
+
+
+
+
+
+ENDDATA
diff --git a/testing/tests/regression-suite/503-iCal-PROPFIND.result b/testing/tests/regression-suite/503-iCal-PROPFIND.result
new file mode 100644
index 00000000..3cc4b197
--- /dev/null
+++ b/testing/tests/regression-suite/503-iCal-PROPFIND.result
@@ -0,0 +1,31 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "45e62f9b3b6b55ac40673d4ef35948b9"
+Content-Length: 623
+Content-Type: text/xml; charset="utf-8"
+
+
+
+
+ /caldav.php/user1/home/
+
+
+
+
+
+
+ home
+
+ HTTP/1.1 200 OK
+
+
+
+
+
+
+
+ HTTP/1.1 404 Not Found
+
+
+
diff --git a/testing/tests/regression-suite/503-iCal-PROPFIND.test b/testing/tests/regression-suite/503-iCal-PROPFIND.test
new file mode 100644
index 00000000..8c0acb34
--- /dev/null
+++ b/testing/tests/regression-suite/503-iCal-PROPFIND.test
@@ -0,0 +1,23 @@
+#
+# Testing with a process similar to iCal 10.5
+#
+TYPE=PROPFIND
+URL=http://mycaldav/caldav.php/user1/home/
+HEAD
+
+HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
+HEADER=Content-Type: text/xml
+HEADER=Depth: 0
+
+BEGINDATA
+
+
+
+
+
+
+
+
+
+
+ENDDATA
diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.result b/testing/tests/regression-suite/504-iCal-PROPFIND.result
new file mode 100644
index 00000000..79aaf950
--- /dev/null
+++ b/testing/tests/regression-suite/504-iCal-PROPFIND.result
@@ -0,0 +1,143 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "47e34444ff36653135bc516cd861b019"
+Content-Length: 3575
+Content-Type: text/xml; charset="utf-8"
+
+
+
+
+ /caldav.php/user1/home/
+
+
+
+
+
+
+ "faf25336de0e470a54075c14cbcf5272"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
+
+
+
+ "00ad5eb1eb5507884710b0b66aa5d5c4"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics
+
+
+
+ "5def8ae2b20893a1c7f4dbaeb008f2f1"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/20061101T073004Z.ics
+
+
+
+ "c3658901fd4689d4a1e1d6f08601ef4f"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics
+
+
+
+ "509b0f0d8a3363379f9f5727f5dd74a0"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
+
+
+
+ "2c32a2f8aba853654eb17fe037a4db4d"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
+
+
+
+ "a1c6404d61190f9574e2bfd69383f144"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics
+
+
+
+ "0d7a68984bf525342d22b8924a57e8e2"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics
+
+
+
+ "cb3d9dc3e8c157f53eba3ea0e1e0f146"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
+
+
+
+ "08a435c2abaf38f4a50a997343c098a7"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics
+
+
+
+ "a2990674708634a311bb98a59865ca50"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
+
+
+
+ "421abf7e4848d2fecbf64217ed205d4b"
+
+ HTTP/1.1 200 OK
+
+
+
+ /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics
+
+
+
+ "ac90acd649c25070b1a2a17fb31a105a"
+
+ HTTP/1.1 200 OK
+
+
+
diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.test b/testing/tests/regression-suite/504-iCal-PROPFIND.test
new file mode 100644
index 00000000..8e5ddaf3
--- /dev/null
+++ b/testing/tests/regression-suite/504-iCal-PROPFIND.test
@@ -0,0 +1,20 @@
+#
+# Testing with a process similar to iCal 10.5
+#
+TYPE=PROPFIND
+URL=http://mycaldav/caldav.php/user1/home/
+HEAD
+
+HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+BEGINDATA
+
+
+
+
+
+
+
+ENDDATA
diff --git a/testing/tests/regression-suite/505-iCal-PUT.result b/testing/tests/regression-suite/505-iCal-PUT.result
new file mode 100644
index 00000000..e0d76fe2
--- /dev/null
+++ b/testing/tests/regression-suite/505-iCal-PUT.result
@@ -0,0 +1,8 @@
+HTTP/1.1 201 Created
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "b3e66a461ef178bd4791b2b6509bbb9d"
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+10 --- VEVENT --- 10 --- AAA9318E-37D9-4319-8626-95ECD3D3B243 --- 2007-11-23 09:30:48 --- 2007-11-25 23:00:00+13 --- 2007-11-26 00:00:00+13 --- --- New Event --- --- --- --- PUBLIC --- OPAQUE --- --- --- --- ---
diff --git a/testing/tests/regression-suite/505-iCal-PUT.test b/testing/tests/regression-suite/505-iCal-PUT.test
new file mode 100644
index 00000000..fe3d2466
--- /dev/null
+++ b/testing/tests/regression-suite/505-iCal-PUT.test
@@ -0,0 +1,68 @@
+#
+# PUT another event into the resource2 calendar so we can DELETE it
+#
+TYPE=PUT
+URL=http://mycaldav/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
+HEADER=Content-Type: text/calendar
+HEAD
+
+
+BEGINDATA
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+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
+BEGIN:VEVENT
+SEQUENCE:1
+TRANSP:OPAQUE
+UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
+DTSTART;TZID=Pacific/Auckland:20071125T230000
+DTSTAMP:20071123T093048Z
+SUMMARY:New Event
+CREATED:20071123T093048Z
+DTEND;TZID=Pacific/Auckland:20071126T000000
+BEGIN:VALARM
+X-WR-ALARMUID:2927836F-DF85-4688-901A-9ABE442BFB62
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user,
+ uid, dtstamp, dtstart, dtend, due, summary, location,
+ description, priority, class, transp, rrule, url,
+ percent_complete, tz_id, status
+FROM caldav_data JOIN calendar_item USING(dav_name)
+WHERE caldav_data.dav_etag =
+'b3e66a461ef178bd4791b2b6509bbb9d';
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/506-iCal-PUT.result b/testing/tests/regression-suite/506-iCal-PUT.result
new file mode 100644
index 00000000..47298e25
--- /dev/null
+++ b/testing/tests/regression-suite/506-iCal-PUT.result
@@ -0,0 +1,8 @@
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "5f050eca5480bbebbe9428222570913d"
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+10 --- VEVENT --- 10 --- AAA9318E-37D9-4319-8626-95ECD3D3B243 --- 2007-11-23 09:32:23 --- 2007-11-25 13:00:00+13 --- 2007-11-25 19:00:00+13 --- --- BBQ @ ML's --- ML's House --- --- --- PUBLIC --- OPAQUE --- --- --- --- ---
diff --git a/testing/tests/regression-suite/506-iCal-PUT.test b/testing/tests/regression-suite/506-iCal-PUT.test
new file mode 100644
index 00000000..1079d608
--- /dev/null
+++ b/testing/tests/regression-suite/506-iCal-PUT.test
@@ -0,0 +1,69 @@
+#
+# PUT a newer version of the event into the calendar.
+#
+TYPE=PUT
+URL=http://mycaldav/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
+HEADER=Content-Type: text/calendar
+HEADER=If-Match: "b3e66a461ef178bd4791b2b6509bbb9d"
+HEAD
+
+
+BEGINDATA
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+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
+BEGIN:VEVENT
+SEQUENCE:6
+TRANSP:OPAQUE
+UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
+DTSTART;TZID=Pacific/Auckland:20071125T130000
+DTSTAMP:20071123T093223Z
+SUMMARY:BBQ @ ML's
+CREATED:20071123T093048Z
+DTEND;TZID=Pacific/Auckland:20071125T190000
+LOCATION:ML's House
+BEGIN:VALARM
+X-WR-ALARMUID:2927836F-DF85-4688-901A-9ABE442BFB62
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user,
+ uid, dtstamp, dtstart, dtend, due, summary, location,
+ description, priority, class, transp, rrule, url,
+ percent_complete, tz_id, status
+FROM caldav_data JOIN calendar_item USING(dav_name)
+WHERE caldav_data.dav_etag =
+'5f050eca5480bbebbe9428222570913d';
+ENDQUERY
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index 877fc9c1..07ec4d6b 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
-ETag: "abe3054a40d9f860fe9ccabef5e558db"
-Content-Length: 5725
+ETag: "0f77e8fc1531888183e35da896c95287"
+Content-Length: 6109
Content-Type: text/xml; charset="utf-8"
@@ -175,6 +175,20 @@ Content-Type: text/xml; charset="utf-8"
HTTP/1.1 200 OK
+
+ /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
+
+
+
+ /caldav.php/user1/
+
+
+ /caldav.php/user1/
+
+
+ HTTP/1.1 200 OK
+
+
/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index 00252749..5ef3242f 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@@ -6,7 +6,7 @@
httpd/unix-directory
Dow, 01 Jan 2000 00:00:00 GMT
- 9531
+ 10512
Dow, 01 Jan 2000 00:00:00 GMT
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
index 1b3fb3c5..dcf27031 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "deadbeefcafefeeddeadbeefcafefeed"
-Content-Length: 1141
+Content-Length: 1142
Content-Type: text/xml; charset="utf-8"
@@ -13,7 +13,7 @@ Content-Type: text/xml; charset="utf-8"
httpd/unix-directory
Dow, 01 Jan 2000 00:00:00 GMT
- 9531
+ 10512
Dow, 01 Jan 2000 00:00:00 GMT
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index 8176541b..767ebeaf 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@@ -6,7 +6,7 @@
httpd/unix-directory
Dow, 01 Jan 2000 00:00:00 GMT
- 9531
+ 10512
Dow, 01 Jan 2000 00:00:00 GMT
@@ -272,6 +272,32 @@
HTTP/1.1 200 OK
+
+ /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
+
+
+ Dow, 01 Jan 2000 00:00:00 GMT
+ 981
+ text/calendar
+ Dow, 01 Jan 2000 00:00:00 GMT
+
+ BBQ @ ML's
+ "5f050eca5480bbebbe9428222570913d"
+ en_NZ.UTF-8
+
+
+
+
+
+
+
+
+
+
+
+ HTTP/1.1 200 OK
+
+
/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
index 36d01e86..6cdbfe77 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@@ -14,7 +14,7 @@
httpd/unix-directory
Dow, 01 Jan 2000 00:00:00 GMT
- 9531
+ 10512
Dow, 01 Jan 2000 00:00:00 GMT
diff --git a/testing/tests/regression-suite/900-Moz-REPORT.result b/testing/tests/regression-suite/900-Moz-REPORT.result
index 793501b2..166138ab 100644
--- a/testing/tests/regression-suite/900-Moz-REPORT.result
+++ b/testing/tests/regression-suite/900-Moz-REPORT.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
-ETag: "d19579c20ab7e6349b50af9e16ef5abd"
-Content-Length: 6643
+ETag: "78f60a204e7deae626d7a11a8f7f8d8e"
+Content-Length: 7901
Keep-Alive: timeout=15, max=100
Connection: Keep-Alive
Content-Type: text/xml; charset="utf-8"
@@ -180,6 +180,61 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
END:DAYLIGHT
END:VTIMEZONE
END:VCALENDAR
+
+
+ HTTP/1.1 200 OK
+
+
+
+ http://mycaldav/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
+
+
+ BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+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
+BEGIN:VEVENT
+SEQUENCE:6
+TRANSP:OPAQUE
+UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
+DTSTART;TZID=Pacific/Auckland:20071125T130000
+DTSTAMP:20071123T093223Z
+SUMMARY:BBQ @ ML's
+CREATED:20071123T093048Z
+DTEND;TZID=Pacific/Auckland:20071125T190000
+LOCATION:ML's House
+BEGIN:VALARM
+X-WR-ALARMUID:2927836F-DF85-4688-901A-9ABE442BFB62
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
HTTP/1.1 200 OK
diff --git a/testing/tests/regression-suite/901-GET-Collection.result b/testing/tests/regression-suite/901-GET-Collection.result
index db60777d..d7d11678 100644
--- a/testing/tests/regression-suite/901-GET-Collection.result
+++ b/testing/tests/regression-suite/901-GET-Collection.result
@@ -1,7 +1,7 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
-Content-Length: 5784
+Content-Length: 6340
Content-Type: text/calendar
BEGIN:VCALENDAR
@@ -120,6 +120,23 @@ DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
X-MOZ-LOCATIONPATH:9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
LOCATION:In a confidential place
END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:6
+TRANSP:OPAQUE
+UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
+DTSTART;TZID=Pacific/Auckland:20071125T130000
+DTSTAMP:20071123T093223Z
+SUMMARY:BBQ @ ML's
+CREATED:20071123T093048Z
+DTEND;TZID=Pacific/Auckland:20071125T190000
+LOCATION:ML's House
+BEGIN:VALARM
+X-WR-ALARMUID:2927836F-DF85-4688-901A-9ABE442BFB62
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
BEGIN:VTODO
CREATED:20070806T223244Z
LAST-MODIFIED:20070806T223411Z
@@ -177,18 +194,25 @@ END:VTIMEZONE
BEGIN:VTIMEZONE
TZID:Pacific/Auckland
BEGIN:STANDARD
-DTSTART:20000319T030000
-RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=3
-TZNAME:Pacific/Auckland
TZOFFSETFROM:+1300
TZOFFSETTO:+1200
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
+TZNAME:NZST
END:STANDARD
BEGIN:DAYLIGHT
-DTSTART:20001001T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:Pacific/Auckland
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