[Sammoa-commits] r358 - trunk