Merge tag 'dev_tr65_tpe_864_01' into int_tr65_nra_2.3
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 25 Jun 2014 13:38:02 +0000 (15:38 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 25 Jun 2014 13:38:02 +0000 (15:38 +0200)

Trivial merge