Merging from trunk

svn path=/branches/release/libs/mem_fn/index.html; revision=84745