r5279 - trunk/cumin/etc