fix bad merge of class-wired-abstract
Merge branch 'master' of git://github.com/CondeNast/pangea

merge