Merge remote-tracking branch 'origin/5.5' 57/14557/1
Vincent COUVERT [Thu, 22 May 2014 13:58:18 +0000 (15:58 +0200)]
Change-Id: I0ef72a163ba0653458bd61e4e3678e3c876d3981

1  2 
scilab/configure
scilab/configure.ac

Simple merge
Simple merge