Porting 3.1.1 changes: more on cvs and branches, more on versions and