cvs commit: src/share/zoneinfo - Imported sources

[Edwin Groothuis]

edwin       2008-01-01 07:45:11 UTC

  FreeBSD src repository

  src/share/zoneinfo - Imported sources
  Update of /home/ncvs/src/share/zoneinfo
  In directory repoman.freebsd.org:/tmp/cvs-serv43771
  
  Log Message:
  MFV of tzdata2007k
  
  - Argentinian DST changes
  - Put SJ in the right location
  
  Approved by: 	grog (implicit)
  
  Status:
  
  Vendor Tag:	ADO
  Release Tags:	tzdata2007k
  		
  U src/share/zoneinfo/africa
  U src/share/zoneinfo/antarctica
  U src/share/zoneinfo/asia
  U src/share/zoneinfo/australasia
  C src/share/zoneinfo/europe
  U src/share/zoneinfo/northamerica
  C src/share/zoneinfo/southamerica
  U src/share/zoneinfo/pacificnew
  U src/share/zoneinfo/etcetera
  U src/share/zoneinfo/factory
  U src/share/zoneinfo/backward
  U src/share/zoneinfo/systemv
  C src/share/zoneinfo/zone.tab
  U src/share/zoneinfo/leapseconds
  U src/share/zoneinfo/yearistype.sh
  
  3 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jADO:yesterday -jADO src/share/zoneinfo