From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 9 Nov 2008 04:19:50 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~39
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=244b95ecbfe2aef911f906a18b17ee25877ab46e;p=thirdparty%2Fsquid.git

Merge from trunk
---

244b95ecbfe2aef911f906a18b17ee25877ab46e