Merge setup_2 with setup

git-svn-id: https://scm.gforge.inria.fr/svn/openalea/trunk@3831 04ea39c6-a500-0410-8508-e77fe2a861cf