From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 2 Jun 2010 13:36:08 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2f60cdcf1e154acb6b6cc6c72f9a354b46cf6c9;p=thirdparty%2Fsquid.git

Merge from trunk
---

e2f60cdcf1e154acb6b6cc6c72f9a354b46cf6c9