From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 2 Jun 2010 13:35:20 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~167^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0434d6b8bb54e77cb023dc2b6e39a4e9ad60289;p=thirdparty%2Fsquid.git

Merge from trunk
---

a0434d6b8bb54e77cb023dc2b6e39a4e9ad60289