Merge remote-tracking branch 'origin/master' dev_tr65_sto_ft880_tests_auto
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Tue, 8 Jul 2014 17:50:16 +0000 (19:50 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Tue, 8 Jul 2014 17:50:16 +0000 (19:50 +0200)

Trivial merge