from trunk

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi@23587 99afaf0d-6903-0410-885a-c66a8bbb5f81