Merge branch 'dev_tr65_lma_1001_iso_maker'
authorLaurent Mazet <laurent.mazet@thalesgroup.com>
Thu, 13 Nov 2014 16:15:04 +0000 (17:15 +0100)
committerLaurent Mazet <laurent.mazet@thalesgroup.com>
Thu, 13 Nov 2014 16:15:04 +0000 (17:15 +0100)

Trivial merge