r5330 - trunk/cumin/model/upgrades