Merge branch 'map' of https://vcs.maemo.org/git/situare into map

diff --cc src/map/mapengine.cpp
Simple merge

diff --cc src/map/mapfetcher.h
index ede0ee0,bf1418f..1ecd1c2
--- 1/src/map/mapfetcher.h
--- 2/src/map/mapfetcher.h
+++ b/src/map/mapfetcher.h
@@@ -60,16 -52,7 +60,15 @@@ public
  /*******************************************************************************
   * CLASS SPECIFIC MEMBER FUNCTIONS AND SLOTS
   ******************************************************************************/
 +public:
 +    /**
 +    * @brief Set size of the download queue
 +    *
 +    * @param size New size
 +    */
 +    void setDownloadQueueSize(int size);
 +
  public slots:
- 
      /**
      * @brief Enqueue fetching of map image
      *

diff --cc src/src.pro
Simple merge