r4793 - trunk/cumin/etc