Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorhenrique <henrique@ub32.(none)>
Tue, 27 Aug 2013 13:07:22 +0000 (15:07 +0200)
committerhenrique <henrique@apache.org>
Tue, 27 Aug 2013 13:13:31 +0000 (15:13 +0200)

Trivial merge