into  trift2.:/MySQL/M51/limit-man-5.1

Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1