Shorter code (not sure if it is more readable, though).
Clearer wording.
Merge branch 'release' into release_python2.3

Conflicts:
	uncertainties/test_uncertainties.py
Merge branch 'release_python2.3' into master_python2.3