From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 25 Sep 2009 11:23:25 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~612^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48fe8b17b7cd632b2f9e4e32dd8609b990923547;p=thirdparty%2Fsquid.git

Merge from trunk
---

48fe8b17b7cd632b2f9e4e32dd8609b990923547