merged changes in regex5 branch

[SVN r26692]

performance/time_localised_boost.cpp

@@ -45,7 +45,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          boost::regex_match(text, what, e);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
@@ -86,7 +86,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          boost::regex_grep(&dummy_grep_proc, text, e);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }