DM Fix 1
Merge branch 'LindleyLentati-python26' into python26

Conflicts:
	PALpulsarInit.py