Merge remote-tracking branch 'origin/dev_tr65_nra_ft827_log4cxx' into dev_tr65_nra_ft... int_tr65_nra_2.3
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 25 Jun 2014 16:25:31 +0000 (18:25 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Wed, 25 Jun 2014 16:25:31 +0000 (18:25 +0200)

Trivial merge