[Tutti-commits] r1830 - trunk