Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Mon, 24 Dec 2012 09:33:55 +0000 (10:33 +0100)
committerJens Geyer <jensg@apache.org>
Mon, 24 Dec 2012 09:33:55 +0000 (10:33 +0100)

Trivial merge