Merging from trunk

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