Merge bogus svn:mergeinfo to allow me to merge this branch

I'll prune unnecessary mergeinfo on merge