Merge branch 'master' of git+ssh://tal.org/home/git/mapper

Resolve conflicts:

	src/map.c

diff --cc src/map.c
index 2a180dfc5960805b781b1ad44ae1dde38d0c7f8e,2cbb27522ca02b92f4d169c84a8c4b7a339ad07b..d6a534fe1f6747cea2f452f5236dbfaf4ec7bd93
--- 1/src/map.c
--- 2/src/map.c
+++ b/src/map.c
@@@ -581,7 -579,13 +587,6 @@@ map_render_tile(guint tilex, guint tile
  
        if (tilex < _world_size_tiles && tiley < _world_size_tiles) {
                /* The tile is possible. */
 -              gchar buffer[BUFFER_SIZE];
 -              GError *error = NULL;
 -              gint zoff;
 -
 -              vprintf("%s(%u, %u, %u, %u)\n", __PRETTY_FUNCTION__,
 -                      tilex, tiley, destx, desty);
--
                for (zoff = (_curr_repo->double_size ? 1 : 0);
                     !pixbuf && (_zoom + zoff) <= MAX_ZOOM
                     && zoff <= TILE_SIZE_P2; zoff += 1) {