r5744 - in trunk: cumin/model/upgrades rosemary/python/rosemary