r5716 - in branches/tmckay: mint/python/mint/aviary sage/python/sage/aviary