r7139: trying to reduce the number of diffs between trunk and 3.0; changing version...