Marged r1131448 as merged to the 1.6 branch.
tree: ea3202ff1cc49a6834ef22aef4032e405e833d1f
  1. modules/
  2. src/
  3. LICENSE.txt
  4. log4j.properties
  5. pom.xml