[Sammoa-commits] r356 - trunk