Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.71.2.16.2.7 -r1.71.2.16.2.8
--- lams_central/conf/language/lams/ApplicationResources.properties	22 Mar 2010 09:02:49 -0000	1.71.2.16.2.7
+++ lams_central/conf/language/lams/ApplicationResources.properties	23 Mar 2010 10:42:56 -0000	1.71.2.16.2.8
@@ -199,6 +199,8 @@
 label.timezone.52  =(GMT +12:00 *Daylight Saving Time) Auckland, Wellington
 label.timezone.53  =(GMT +12:00 *Daylight Saving Time) Kamchatka
 label.timezone.54  =(GMT +12:00) Fiji
+label.timezone.55  =(GMT +13:00) Tonga
+label.timezone.56  =(GMT +14:00) Kiritimati
 label.timezone.title  =Time Zone
 label.title  =Title
 label.user.guide  =[HELP]
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.67.2.13.4.7 -r1.67.2.13.4.8
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	22 Mar 2010 09:02:49 -0000	1.67.2.13.4.7
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	23 Mar 2010 10:42:56 -0000	1.67.2.13.4.8
@@ -199,6 +199,8 @@
 label.timezone.52  =(GMT +12:00 *Daylight Saving Time) Auckland, Wellington
 label.timezone.53  =(GMT +12:00 *Daylight Saving Time) Kamchatka
 label.timezone.54  =(GMT +12:00) Fiji
+label.timezone.55  =(GMT +13:00) Tonga
+label.timezone.56  =(GMT +14:00) Kiritimati
 label.timezone.dst  =*DST - Daylight Saving Time is observed
 label.timezone.title  =Time Zone
 label.title  =Title
Index: lams_central/web/editprofile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v
diff -u -r1.14.4.3.2.2 -r1.14.4.3.2.3
--- lams_central/web/editprofile.jsp	22 Mar 2010 09:02:49 -0000	1.14.4.3.2.2
+++ lams_central/web/editprofile.jsp	23 Mar 2010 10:42:56 -0000	1.14.4.3.2.3
@@ -131,7 +131,7 @@
 		<td class="align-right"><fmt:message key="label.timezone.title"/>:</td>
 		<td>
 			<html:select property="timeZone">
-				<c:forEach begin="0" end="54" var="index">
+				<c:forEach begin="0" end="56" var="index">
 					<html:option value="${index}">
 						<fmt:message key="label.timezone.${index}"/>
 					</html:option>
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.36.4.5.2.3 -r1.36.4.5.2.4
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	22 Mar 2010 09:02:45 -0000	1.36.4.5.2.3
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	23 Mar 2010 10:42:51 -0000	1.36.4.5.2.4
@@ -177,7 +177,8 @@
 	    "Asia/Yekaterinburg", "Etc/GMT-5", "Asia/Calcutta", "Asia/Katmandu", "Asia/Almaty", "Etc/GMT-6",
 	    "Asia/Krasnoyarsk", "Etc/GMT-7", "Asia/Irkutsk", "Etc/GMT-8", "Asia/Yakutsk", "Etc/GMT-9",
 	    "Australia/Adelaide", "Australia/Darwin", "Australia/Sydney", "Asia/Vladivostok", "Etc/GMT-10",
-	    "Asia/Magadan", "Etc/GMT-11", "Pacific/Auckland", "Asia/Kamchatka", "Etc/GMT-12" };
+	    "Asia/Magadan", "Etc/GMT-11", "Pacific/Auckland", "Asia/Kamchatka", "Etc/GMT-12", "Pacific/Tongatapu",
+	    "Pacific/Kiritimati" };
     
     /** full constructor */
     public User(String login, String password, String title, String firstName, String lastName, String addressLine1,