Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique <henrique@henrique-vb.(none)>
Fri, 10 May 2013 23:23:07 +0000 (01:23 +0200)
committerHenrique <henrique@henrique-vb.(none)>
Fri, 10 May 2013 23:24:17 +0000 (01:24 +0200)

Trivial merge