r4857 - in branches/sage_addition: . cumin sage