r4535 - trunk/cumin