Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique Mendonça <henrique@apache.org>
Thu, 16 May 2013 19:37:32 +0000 (21:37 +0200)
committerHenrique Mendonça <henrique@apache.org>
Thu, 16 May 2013 19:37:32 +0000 (21:37 +0200)

Trivial merge