[Sammoa-commits] r640 - trunk