[Callao-commits] r2696 - trunk