From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 21 Nov 2009 12:23:23 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~472^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f6ca4b96692f4278978b811327fb8c43af25963;p=thirdparty%2Fsquid.git

Merge from trunk
---

2f6ca4b96692f4278978b811327fb8c43af25963