r5264 - trunk/cumin