down integrate to svn


git-svn-id: http://protobuf.googlecode.com/svn@530 630680e5-0e50-0410-840e-4b1c322b438d