Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique Mendonça <henrique@apache.org>
Wed, 5 Jun 2013 10:51:02 +0000 (12:51 +0200)
committerHenrique Mendonça <henrique@apache.org>
Wed, 5 Jun 2013 10:51:02 +0000 (12:51 +0200)

Trivial merge