r4675 - trunk/cumin/etc