From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 9 Apr 2009 13:34:17 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1072^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d77f5a3e1a07614eb8c359d0b3932f4146b31f2b;p=thirdparty%2Fsquid.git

Merge from trunk
---

d77f5a3e1a07614eb8c359d0b3932f4146b31f2b