Merge branch 'upstreamcvs'

Merge branch 'upstreamcvs'

Conflicts:
	CVS/Entries
	docs/CVS/Entries
	etc/samples/valid/CVS/Entries
	etc/zoneinfo-outlook-global/Africa/CVS/Entries
	etc/zoneinfo-outlook-global/America/Argentina/CVS/Entries
	etc/zoneinfo-outlook-global/America/CVS/Entries
	etc/zoneinfo-outlook-global/America/Indiana/CVS/Entries
	etc/zoneinfo-outlook-global/America/Kentucky/CVS/Entries
	etc/zoneinfo-outlook-global/America/North_Dakota/CVS/Entries
	etc/zoneinfo-outlook-global/Antarctica/CVS/Entries
	etc/zoneinfo-outlook-global/Arctic/CVS/Entries
	etc/zoneinfo-outlook-global/Asia/CVS/Entries
	etc/zoneinfo-outlook-global/Atlantic/CVS/Entries
	etc/zoneinfo-outlook-global/Australia/CVS/Entries
	etc/zoneinfo-outlook-global/CVS/Entries
	etc/zoneinfo-outlook-global/Europe/CVS/Entries
	etc/zoneinfo-outlook-global/Indian/CVS/Entries
	etc/zoneinfo-outlook-global/Pacific/CVS/Entries
	etc/zoneinfo-outlook/Africa/CVS/Entries
	etc/zoneinfo-outlook/America/Argentina/CVS/Entries
	etc/zoneinfo-outlook/America/CVS/Entries
	etc/zoneinfo-outlook/America/Indiana/CVS/Entries
	etc/zoneinfo-outlook/America/Kentucky/CVS/Entries
	etc/zoneinfo-outlook/America/North_Dakota/CVS/Entries
	etc/zoneinfo-outlook/Antarctica/CVS/Entries
	etc/zoneinfo-outlook/Arctic/CVS/Entries
	etc/zoneinfo-outlook/Asia/CVS/Entries
	etc/zoneinfo-outlook/Atlantic/CVS/Entries
	etc/zoneinfo-outlook/Australia/CVS/Entries
	etc/zoneinfo-outlook/CVS/Entries
	etc/zoneinfo-outlook/Europe/CVS/Entries
	etc/zoneinfo-outlook/Indian/CVS/Entries
	etc/zoneinfo-outlook/Pacific/CVS/Entries
	source/net/fortuna/ical4j/data/CVS/Entries
	source/net/fortuna/ical4j/model/CVS/Entries
	source/net/fortuna/ical4j/model/component/CVS/Entries
	source/net/fortuna/ical4j/model/property/CVS/Entries
	source/net/fortuna/ical4j/util/CVS/Entries
	test/net/fortuna/ical4j/data/CVS/Entries
	test/net/fortuna/ical4j/model/CVS/Entries
	test/net/fortuna/ical4j/model/component/CVS/Entries
	test/net/fortuna/ical4j/model/property/CVS/Entries
	test/net/fortuna/ical4j/util/CVS/Entries