Merge branch 'master' of git@git.scilab.org:scilab
Sylvestre Ledru [Wed, 16 Sep 2009 19:12:05 +0000 (21:12 +0200)]
1  2 
scilab/modules/fileio/Makefile.am
scilab/modules/xpad/Makefile.am

Simple merge
Simple merge