tree 613d47ba2bd4baad155c6b3ab8e4f325ebbf262a
parent fe55e75bbd0e5ff886d4b64b202f7a3e1e1df8a7
author Bryan Duxbury <bryanduxbury@apache.org> 1274286488 +0000
committer Bryan Duxbury <bryanduxbury@apache.org> 1274286488 +0000

Merge in THRIFT-784 and THRIFT-646

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/branches/0.3.0@946261 13f79535-47bb-0310-9956-ffa450edef68