From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Mon, 23 Jun 2014 09:52:23 +0000 (+0200)
Subject: Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_nra_ft827_log4cxx
X-Git-Tag: debian_7.5_20141208~72
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=647c157c8e7994bf31d7ca34aff60cc4d206d9fb;p=debian6500.git

Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_nra_ft827_log4cxx

Conflicts:
	dev/modele/debian/SConscript
	dev/modele/debian/script/start_trc6500.sh
	dev/modele/debian_mhf/script/start_trc6500.sh
---

647c157c8e7994bf31d7ca34aff60cc4d206d9fb