Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Mon, 29 Apr 2013 20:10:35 +0000 (22:10 +0200)
committerJens Geyer <jensg@apache.org>
Mon, 29 Apr 2013 20:10:35 +0000 (22:10 +0200)

Trivial merge