3d7a6823f7
has a new timestamp as needed for mergemaster. A more long term solution to this is needed since svn doesn't support forced commits.