From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Wed, 25 Jun 2014 16:01:18 +0000 (+0200)
Subject: Merge branch 'int_tr65_nra_2.3' into dev_tr65_nra_ft827_log4cxx
X-Git-Tag: debian_7.5_20141208~71
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=397b7cd99e51605f6f95df462bb5c4e75c4abbb4;hp=-c;p=debian6500.git

Merge branch 'int_tr65_nra_2.3' into dev_tr65_nra_ft827_log4cxx
Contains corrections of PCR 852, 864, 870

Conflicts:
	dev/modele/debian/SConscript
---

397b7cd99e51605f6f95df462bb5c4e75c4abbb4