[Wao-commits] r1644 - trunk