From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 7 Jan 2009 06:26:28 +0000 (+1300)
Subject: merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1269^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eca70f3b35a4c7b62467b2d93aa73dca72076271;p=thirdparty%2Fsquid.git

merge from trunk
---

eca70f3b35a4c7b62467b2d93aa73dca72076271