Merging from trunk

svn path=/branches/release/libs/regex/; revision=84745