From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 16 Nov 2008 01:29:09 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=220fb4d5744b8b2b886db734bfc8b1e79d42d149;p=thirdparty%2Fsquid.git

Merge from trunk
---

220fb4d5744b8b2b886db734bfc8b1e79d42d149