Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique <henrique@henrique-vb.(none)>
Sat, 11 May 2013 18:42:38 +0000 (20:42 +0200)
committerHenrique <henrique@henrique-vb.(none)>
Sat, 11 May 2013 18:42:38 +0000 (20:42 +0200)

Trivial merge