# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1323700370 -3600
# Node ID 824f49d5488e197d8b094c274b3db1a321bc163c
# Parent  35dc4fc94bcc2b83fa604cc3ab42d851472d60a5# Parent  6f0fb6086bf396ea9083db6edd5d468612f85be0
Merge with 6f0fb6086bf396ea9083db6edd5d468612f85be0

diff -r 35dc4fc94bcc -r 824f49d5488e .pydevproject
--- a/.pydevproject	Sat Dec 17 18:16:56 2011 +0100
+++ b/.pydevproject	Mon Dec 12 15:32:50 2011 +0100
@@ -4,7 +4,7 @@
 <pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/ztfy.utils</path>
+<path>/ZTFY.utils (hg)</path>
 </pydev_pathproperty>
 
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python 2.6 (BB)</pydev_property>
diff -r 35dc4fc94bcc -r 824f49d5488e ztfy/utils/timezone/utility.py