2.1svn_trunkAutoResolution