merge in THRIFT-1033 from trunk

git-svn-id: https://svn.apache.org/repos/asf/thrift/branches/0.6.x@1057810 13f79535-47bb-0310-9956-ffa450edef68