Merge proposals dependent on lp://staging/~adrian-wilkins/bzr-svn/fix-any-function-python-2.5ism

1. fix-any-function-python-2.5ism
2. Dependent merge proposals