r5747 - in trunk: cumin/model/admin cumin/model/upgrades rosemary/python/rosemary