From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 5 Oct 2009 08:55:38 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~612^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18180ac782ed7cb11000911ccaddce5b6c0a927;p=thirdparty%2Fsquid.git

Merge from trunk
---

a18180ac782ed7cb11000911ccaddce5b6c0a927