From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 10 Dec 2008 04:46:55 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1255^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=588cf2e0562244206fff8a132de492dbf6924c1a;p=thirdparty%2Fsquid.git

Merge from trunk
---

588cf2e0562244206fff8a132de492dbf6924c1a