Merge remote-tracking branch 'origin/dev_tr65_tpe_910_start_active_state_param' into...
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Mon, 1 Sep 2014 15:21:20 +0000 (17:21 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Mon, 1 Sep 2014 15:21:20 +0000 (17:21 +0200)

Trivial merge