Merge remote-tracking branch 'origin/dev_tr65_aca_882_pb_evf_terrain' into int_tr65_n...
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 18 Jul 2014 09:43:14 +0000 (11:43 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 18 Jul 2014 09:43:14 +0000 (11:43 +0200)

Trivial merge