Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_877_resolu... dev_tr65_aca_877_resolution_dsp
authorAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Tue, 2 Sep 2014 09:53:26 +0000 (11:53 +0200)
committerAlexandre Cazalis (Alten) <alexandre.cazalis@external.thalesgroup.com>
Tue, 2 Sep 2014 09:53:26 +0000 (11:53 +0200)

Trivial merge