# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1205276383 -3600
# Node ID 5e5ce714ba95bb4590cddf2b1a03f9f00669dd70
# Parent  bd61e44eb2ccbadd5f64e27900c8c1861077c0c4# Parent  210ee6204a295d21bf444d98dc92cf7e23973c71
merge with main

diff -r bd61e44eb2cc -r 5e5ce714ba95 mercurial/util.py
--- a/mercurial/util.py	Tue Mar 11 11:38:12 2008 -0700
+++ b/mercurial/util.py	Tue Mar 11 23:59:43 2008 +0100
@@ -1532,7 +1532,7 @@
     t, tz = date or makedate()
     s = time.strftime(format, time.gmtime(float(t) - tz))
     if timezone:
-        s += timezone_format % (-tz / 3600, ((-tz % 3600) / 60))
+        s += timezone_format % (int(-tz / 3600.0), ((-tz % 3600) / 60))
     return s
 
 def shortdate(date=None):