From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Sun, 30 Jan 2011 04:41:33 +0000 (+0300)
Subject: Merge 3p2-rock.
X-Git-Tag: take01~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1663dabda52100bde21d984d28df9f39ac92ffbb;p=thirdparty%2Fsquid.git

Merge 3p2-rock.
---

1663dabda52100bde21d984d28df9f39ac92ffbb