Yup, that's the one - either method works, although I did need to relink /usr/bin/python to /usr/bin/python2.5 after uninstalling python launcher, as the uninstallation process didn't take care of that.