Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorhenrique <henrique@apache.org>
Thu, 29 Aug 2013 16:06:45 +0000 (18:06 +0200)
committerhenrique <henrique@apache.org>
Thu, 29 Aug 2013 16:06:45 +0000 (18:06 +0200)

Trivial merge