Merge branch 'master' of alioth.debian.org:/git/collab-maint/navit

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 0deeffa,2d8259c..dba45b4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,23 +1,27 @@@
- navit (0.2.0~svn2663+dfsg.1-2) unstable; urgency=low
+ navit (0.2.0~svn2755+dfsg.1-1) unstable; urgency=low
  
++  [ Gilles Filippini ]
+   * New upstream snapshot:
+     + Make osm2navit more modular and renamed to maptool
+     + Experimental support for Contraction Hierarchies routing
+     + New map type filter to filter other maps
+     + Map attributes are now setable
+     + New vehicle type: null
+     + Support for automatic day night switching
+     + gui_internal: new tool to show locale configuration
+     + Update python and dbus APIs
+     + navit.xml cleanup
+     + Translations update
+     + Bug fixes
+   * debian/control:
+     + Handle transition from osm2navit to maptool
+   * Rename and update debian/osm2navit.* to debian/maptool.*
 -  * Remove patch mg-mmap (applied upstream) 
++  * Remove patch mg-mmap (applied upstream)
++
++  [ Bernd Zeimetz ]
 +  * Remove myself from uploaders. 
  
-  -- Bernd Zeimetz <bzed@debian.org>  Mon, 09 Nov 2009 22:46:52 +0100
+  -- Gilles Filippini <gilles.filippini@free.fr>  Mon, 16 Nov 2009 16:13:00 +0100
  
  navit (0.2.0~svn2663+dfsg.1-1) unstable; urgency=low
  

diff --cc debian/control
Simple merge