Merging from trunk

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