Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/barry/barry/src/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- src/Makefile.am	7 Dec 2007 21:27:34 -0000	1.27
+++ src/Makefile.am	29 Feb 2008 17:46:23 -0000
@@ -71,6 +71,7 @@
 	r_saved_message.h \
 	r_servicebook.h \
 	r_task.h \
+	r_timezone.h \
 	socket.h \
 	time.h \
 	usbwrap.h \
@@ -99,6 +100,7 @@
 	r_saved_message.cc \
 	r_servicebook.cc \
 	r_task.cc \
+	r_timezone.cc \
 	packet.cc packet.h \
 	controller.cc \
 	version.cc \
Index: src/protostructs.h
===================================================================
RCS file: /cvsroot/barry/barry/src/protostructs.h,v
retrieving revision 1.18
diff -u -r1.18 protostructs.h
--- src/protostructs.h	26 Jan 2008 03:58:29 -0000	1.18
+++ src/protostructs.h	29 Feb 2008 17:46:23 -0000
@@ -82,6 +82,7 @@
 		int32_t		min1900;
 		uint16_t	code;
 		uint8_t		raw[1];
+		int16_t		int16;
 
 	} __attribute__ ((packed)) u;
 
Index: src/record.h
===================================================================
RCS file: /cvsroot/barry/barry/src/record.h,v
retrieving revision 1.31
diff -u -r1.31 record.h
--- src/record.h	26 Jan 2008 03:58:29 -0000	1.31
+++ src/record.h	29 Feb 2008 17:46:23 -0000
@@ -232,6 +232,7 @@
 #include "r_pin_message.h"
 #include "r_saved_message.h"
 #include "r_folder.h"
+#include "r_timezone.h"
 
 #endif
 
Index: src/s11n-boost.h
===================================================================
RCS file: /cvsroot/barry/barry/src/s11n-boost.h,v
retrieving revision 1.14
diff -u -r1.14 s11n-boost.h
--- src/s11n-boost.h	26 Jan 2008 03:58:29 -0000	1.14
+++ src/s11n-boost.h	29 Feb 2008 17:46:23 -0000
@@ -261,6 +261,15 @@
 	}
 }
 
+template <class ArchiveT>
+void serialize(ArchiveT &ar, Barry::Timezone &t, const unsigned int ver)
+{
+    ar & make_nvp("TimeZoneName", t.TimeZoneName);
+    if( ver < BARRY_POD_MAP_VERSION) {
+        ar & make_nvp("Unknowns", t.Unknowns);
+    }
+}
+
 }} // namespace boost::serialization
 
 #endif
Index: tools/btool.cc
===================================================================
RCS file: /cvsroot/barry/barry/tools/btool.cc,v
retrieving revision 1.31
diff -u -r1.31 btool.cc
--- tools/btool.cc	26 Jan 2008 03:58:29 -0000	1.31
+++ tools/btool.cc	29 Feb 2008 17:46:24 -0000
@@ -261,6 +261,11 @@
 			new RecordParser<Folder, Store<Folder> > (
 				new Store<Folder>(filename, false)));
 	}
+	else if( name == Timezone::GetDBName() ) {
+		return auto_ptr<Parser>(
+				new RecordParser<Timezone, Store<Timezone> > (
+						new Store<Timezone>(filename, false)));
+	}
 	else {
 		// unknown database, use null parser
 		return auto_ptr<Parser>( new DataDumpParser );