# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1341797769 -3600
# Node ID 24c2150cc8b0723b9057bc592961f76f1af2acf1
# Parent  e3ff2656cb37bea3e4828833390c66888e4506f2# Parent  0e9a5b63206a6c5d6a4b6837865ee3c738099b3d
Merge 0.9->trunk

diff -r e3ff2656cb37 -r 24c2150cc8b0 util/throttle.lua
--- a/util/throttle.lua	Sun Jul 08 18:54:56 2012 +0100
+++ b/util/throttle.lua	Mon Jul 09 02:36:09 2012 +0100
@@ -1,6 +1,7 @@
 
 local gettime = require "socket".gettime;
 local setmetatable = setmetatable;
+local floor = math.floor;
 
 module "throttle"
 
@@ -11,7 +12,7 @@
 	local newt = gettime();
 	local elapsed = newt - self.t;
 	self.t = newt;
-	local balance = self.rate * elapsed + self.balance;
+	local balance = floor(self.rate * elapsed) + self.balance;
 	if balance > self.max then
 		self.balance = self.max;
 	else