Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Tue, 24 Feb 2015 09:46:48 +0000 (10:46 +0100)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Tue, 24 Feb 2015 09:46:48 +0000 (10:46 +0100)

Trivial merge