From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 2 May 2010 04:41:55 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=083df562920f107db3595f1a70c4e4d203249545;p=thirdparty%2Fsquid.git

Merge from trunk
---

083df562920f107db3595f1a70c4e4d203249545