merge in THRIFT-1033 from trunk
authorBryan Duxbury <bryanduxbury@apache.org>
Tue, 11 Jan 2011 19:21:51 +0000 (19:21 +0000)
committerBryan Duxbury <bryanduxbury@apache.org>
Tue, 11 Jan 2011 19:21:51 +0000 (19:21 +0000)
commit960173564264caf33ffae71ba27cd366126ce660
treeb1c32e28279aaff3da2546f043cae92c82ae7822
parente22ff6dbea0d2e667052a778ade4bd9341333f77
parent0c124bb94f86eead61ef1c65dc6b38f5f60076f9
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