Copied head of tag ORCHIDEE_2_1 into new version ORCHIDEE_2_2. This version will contain bug corrections and some developpements. It can be considered in between a tag and a branch. Everything that is commited into this version should also go into the trunk.