enthought/enaml — pull request #141 by sccolbert (2012-04-10 22:53:53+00:00)
Title: Fix no deprecate merge

This fixes the merge conflicts in PR #129