From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 3 Sep 2009 13:07:01 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~741^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6ab2f9099c1242c2f015a59fd9b77bdd27205f1;p=thirdparty%2Fsquid.git

Merge from trunk
---

b6ab2f9099c1242c2f015a59fd9b77bdd27205f1