the changes are to support multiple versions (ie, trunk and 2.5).
Also check for conflicts in the .tex file when a release is cut.