Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Wed, 14 Jan 2015 14:21:00 +0000 (15:21 +0100)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Wed, 14 Jan 2015 14:21:00 +0000 (15:21 +0100)

Trivial merge