fixed typo in exception message
support for osgeo.ogr for reading OGR geometries (besides direct use of libgdal)
update GDAL/OGR docs for windows
update deployment documentation (no longer recommend FastCGI)
raise ConfigurationError for unknown merge_methods
document merge_method
update CHANGES.txt for 1.6
Merge remote-tracking branch 'upstream/master'