From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 14 Jun 2009 05:36:55 +0000 (+1200)
Subject: Merged from trunk
X-Git-Tag: SQUID_3_2_0_1~951^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fea6f0373e63db37c06792c25422fd4f47640fa;p=thirdparty%2Fsquid.git

Merged from trunk
---

5fea6f0373e63db37c06792c25422fd4f47640fa