[Wao-commits] r1647 - trunk