Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Sat, 15 Dec 2012 02:16:46 +0000 (03:16 +0100)
committerJens Geyer <jensg@apache.org>
Sat, 15 Dec 2012 02:16:46 +0000 (03:16 +0100)

Trivial merge