From: root <root@blitz.inria.fr>
Date: Mon, 22 Nov 2010 05:13:37 +0000 (+0100)
Subject: Merge commit 'local_master/1.3.5.1@6970' into trunk@12172
X-Git-Url: http://git.onelab.eu/?p=iptables.git;a=commitdiff_plain;h=refs%2Fheads%2Ftrunk%4012172

Merge commit 'local_master/1.3.5.1@6970' into trunk@12172
---

ea0ac95e02088de09de80f00e0ea129f7c950b03