branching to deal with currently broken inheritance code
Authored by: zooty 2010-09-14
Parent: [r2161]
Child: [r2163]