Ugh. The previous change broke under 1.5.2. Work around it, and clean
up some more hwile we're at it.


git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@173 4cde692c-a291-49d1-8350-778aa11640f8
1 file changed