Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Sun, 16 Dec 2012 18:04:52 +0000 (19:04 +0100)
committerJens Geyer <jensg@apache.org>
Sun, 16 Dec 2012 18:04:52 +0000 (19:04 +0100)

Trivial merge