[mountainlion-changes] trunk VERSION_INFO,1.6,1.7