Fix common typo in docstrings.
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/s3/s3gis.py