Merging from trunk

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