Merge remote-tracking branch 'origin/5.5' 26/16226/1
Vincent COUVERT [Tue, 24 Mar 2015 09:23:24 +0000 (10:23 +0100)]
Change-Id: Iaed8be569aa25735867a884f84c737e1cc2a945f

1  2 
scilab/configure

Simple merge