From: Thomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Date: Wed, 18 Feb 2015 16:25:10 +0000 (+0100)
Subject: Merge branch 'master' into 1060_swm_suppression
X-Git-Tag: debian_7.8.1~9
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=db490f01bd6546802af2eec878abdbf762adeeaa;p=debian6500.git

Merge branch 'master' into 1060_swm_suppression
---

db490f01bd6546802af2eec878abdbf762adeeaa