Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Wed, 23 Jan 2013 19:59:13 +0000 (20:59 +0100)
committerJens Geyer <jensg@apache.org>
Wed, 23 Jan 2013 19:59:13 +0000 (20:59 +0100)

Trivial merge