proofpoint/platform — pull request #129 by johngmyers (2012-08-04 05:11:51+00:00)
Title: Merge changes from airlift

Doesn't merge the package change, the Java 7 change or the deprecation of MeterStat.