tree b1c32e28279aaff3da2546f043cae92c82ae7822
parent e22ff6dbea0d2e667052a778ade4bd9341333f77
parent 0c124bb94f86eead61ef1c65dc6b38f5f60076f9
author Bryan Duxbury <bryanduxbury@apache.org> 1294773711 +0000
committer Bryan Duxbury <bryanduxbury@apache.org> 1294773711 +0000

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