Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Thu, 21 Mar 2013 17:59:45 +0000 (19:59 +0200)
committerJens Geyer <jensg@apache.org>
Thu, 21 Mar 2013 17:59:45 +0000 (19:59 +0200)

Trivial merge