Merge branch 'int_tr65_nra_2.3' into dev_tr65_nra_ft827_log4cxx
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 25 Jun 2014 16:01:18 +0000 (18:01 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 25 Jun 2014 16:01:18 +0000 (18:01 +0200)
Contains corrections of PCR 852, 864, 870

Conflicts:
dev/modele/debian/SConscript


Trivial merge