Merge commit 'origin/5.1'
Pierre LANDO [Mon, 21 Sep 2009 09:24:48 +0000 (11:24 +0200)]
Conflicts:
scilab/modules/graphics/help/en_US/xsegs.xml


Trivial merge