Merge branch '5.2' of git.scilab.org:scilab into 5.2
Allan CORNET [Fri, 8 Jan 2010 13:28:49 +0000 (14:28 +0100)]

Trivial merge