Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Tue, 15 Sep 2015 09:29:19 +0000 (11:29 +0200)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Tue, 15 Sep 2015 09:29:19 +0000 (11:29 +0200)

Trivial merge