[Wao-commits] r2132 - in branches: . wao-4.0-jdk6