py-cvs-rel2_1 (Rev 1.12) merge - whitespace normalization
py-cvs-rel2_1 (Rev 1.12) merge - whitespace normalization

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator