merged from trunk

svn path=/branches/proto/v4/libs/proto/; revision=49607