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

Merge 3p2-rock.
---

cdbe1812792e7aae68fcace4af0b59f2aab2f3ae