Merge remote-tracking branch 'origin/dev_tr65_aca_882_pb_evf_terrain' into int_tr65_n...
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 23 Jul 2014 14:58:05 +0000 (16:58 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 23 Jul 2014 14:58:05 +0000 (16:58 +0200)

Trivial merge