Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Fri, 21 Dec 2012 22:08:22 +0000 (23:08 +0100)
committerJens Geyer <jensg@apache.org>
Fri, 21 Dec 2012 22:08:22 +0000 (23:08 +0100)

Trivial merge