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)
git-svn-id: https://svn.apache.org/repos/asf/thrift/branches/0.6.x@1057810 13f79535-47bb-0310-9956-ffa450edef68


Trivial merge