r5378 - trunk/cumin/etc