# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1302903906 -3600
# Node ID 210639fb8fbee1d28194466b5912fd76f0528d82
# Parent  7b456af75c77a636809dc368f7319df12836f1c6# Parent  96e9d5f9ab3b5cfad2ddf0a752e2af2cce2be330
Merge Zash->trunk

diff -r 96e9d5f9ab3b -r 210639fb8fbe util/datetime.lua
--- a/util/datetime.lua	Fri Apr 15 00:54:10 2011 +0200
+++ b/util/datetime.lua	Fri Apr 15 22:45:06 2011 +0100
@@ -49,7 +49,7 @@
 				if sign == "-" then tzd_offset = -tzd_offset; end
 			end
 			sec = (sec + time_offset) - tzd_offset;
-			return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec});
+			return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec, isdst=false});
 		end
 	end
 end