From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 23 Jun 2009 23:29:56 +0000 (+1200)
Subject: merge from trunk
X-Git-Tag: SQUID_3_2_0_1~855^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b8e8ace69052065c84e32531cf5b88838ca5733;p=thirdparty%2Fsquid.git

merge from trunk
---

6b8e8ace69052065c84e32531cf5b88838ca5733