next comment in english
Merge branch 'master' of https://github.com/pottwal/python

Conflicts:
	parseIrtKml/parseIrtKml.py