Log Message:
Move the revision string substituion stuff to pre-patch

Fix the substitution string to include the trailing / within the 's,
and add a blank line for readability (thanks jnemeth@ for these two).