From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 12 Jan 2010 06:17:22 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~466^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fdee55952db30c9b57903ab151bd664d350b5da;p=thirdparty%2Fsquid.git

Merge from trunk
---

2fdee55952db30c9b57903ab151bd664d350b5da