rm cmake from the release branch before it goes out broken.  Policy dictates that you never commit to release, you commit to trunk and merge to release.
Housekeeping merges.
Merge some link fixes.