From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 28 Aug 2009 01:48:05 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~741^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=463f57aeb03d54bea0a93bf0c7ef7c137a3685aa;p=thirdparty%2Fsquid.git

Merge from trunk
---

463f57aeb03d54bea0a93bf0c7ef7c137a3685aa