From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Wed, 11 Feb 2015 14:41:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: debian_7.8.1~11
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=e66ead2800e67fdfdc8a5290bff798b5347e26d0;p=debian6500.git

Merge remote-tracking branch 'origin/master'
---

e66ead2800e67fdfdc8a5290bff798b5347e26d0