From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Tue, 1 Feb 2011 08:26:02 +0000 (+0300)
Subject: Merge 3p2-rock.
X-Git-Tag: take01~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f07f2e5e89317be64e7551fbc0b42c8fa20a2b7a;p=thirdparty%2Fsquid.git

Merge 3p2-rock.
---

f07f2e5e89317be64e7551fbc0b42c8fa20a2b7a