Merge commit 'origin/master' into atoms
Pierre MARECHAL [Fri, 26 Jun 2009 14:22:45 +0000 (16:22 +0200)]
1  2 
scilab/configure
scilab/configure.ac

Simple merge
Simple merge