[imposm] 06/47: Merge commit 'upstream/2.3.2'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository imposm.

commit 0d2cf88c3d71de155ee1548a1d7feaa630939a4f
Merge: 6f741f2 e3b372e
Author: David Paleino <dapal at debian.org>
Date:   Tue Oct 11 23:07:43 2011 +0200

    Merge commit 'upstream/2.3.2'

 CHANGES                          |   43 +
 MANIFEST.in                      |    3 +
 PKG-INFO                         |   45 +-
 imposm.egg-info/PKG-INFO         |   45 +-
 imposm.egg-info/SOURCES.txt      |    9 +-
 imposm/app.py                    |  105 +-
 imposm/base.py                   |    2 +-
 imposm/cache/internal.cc         |  717 ++++++
 imposm/cache/osm.py              |   26 +-
 imposm/cache/tc.c                | 5063 ++++++++++++++++++++++++++++++++++----
 imposm/cache/tc.pyx              |  187 +-
 imposm/{version.py => config.py} |   12 +-
 imposm/db/__init__.py            |    4 -
 imposm/db/config.py              |   73 +
 imposm/db/postgis.py             |   62 +-
 imposm/dbimporter.py             |   26 +-
 imposm/defaultmapping.py         |   63 +-
 imposm/geom.py                   |    9 +-
 imposm/mapping.py                |  316 ++-
 imposm/multipolygon.py           |  222 +-
 imposm/psqldb.py                 |    2 +-
 imposm/test/test_cache.py        |   57 +-
 imposm/test/test_field_types.py  |   49 +
 imposm/test/test_imported.py     |  108 +
 imposm/test/test_multipolygon.py |  294 ++-
 imposm/test/test_tag_mapper.py   |  140 ++
 imposm/version.py                |    2 +-
 imposm/writer.py                 |   30 +-
 internal.proto                   |   11 +
 setup.py                         |   31 +
 30 files changed, 7066 insertions(+), 690 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git