Squashed 'ayrault/' content from commit a0d5707

git-subtree-dir: ayrault
git-subtree-split: a0d57076c765056e38e1f88bf3c4f9dc1669b5fc
Merge commit '55e6a0f4ea0af731160da9896c32a7f479989e95' as 'ayrault'
Squashed 'NJ_HITEC/' content from commit 54a99a2

git-subtree-dir: NJ_HITEC
git-subtree-split: 54a99a29b5e9bc317b03bfab836df2f094053df7
Merge commit 'b20d42e3e5895e986bbf860eba6537ad40f52cfc' as 'NJ_HITEC'