Merging from trunk

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