[us-commits] r2840 - trunk/utils