[Sammoa-commits] r658 - trunk