Merging from trunk

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