From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 10 Jan 2010 12:16:14 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~472^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b79dfed1084feac83cebc3826e2883c1b99f1be;p=thirdparty%2Fsquid.git

Merge from trunk
---

8b79dfed1084feac83cebc3826e2883c1b99f1be