--
This version started with the merge of the MERGE-OCN branch with the revision 2740 of the trunk of ORCHIDEE.