tree a9b28a1e4ae9a6286676e76d345abb9173ac7e60
parent cb13729795173b2763e0ccec3412c9188bfba6a2
author David Reiss <dreiss@apache.org> 1213146989 +0000
committer David Reiss <dreiss@apache.org> 1213146989 +0000

Clean up some bad/missed merges from the alterl merge.


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