--- branches/ports/maemo/debian/changelog	2009/02/08 22:18:39	62
+++ branches/ports/maemo/debian/changelog	2009/02/08 22:52:48	63
@@ -1,3 +1,10 @@
+osm2go (0.6.12-maemo1) unstable; urgency=low
+
+  * Merge trunk, and begin building in the new way.
+  * Version prefix/suffix parser merged from branches/ports/debian.
+
+ -- Andrew Chadwick <andrewc@piffle.org>  Sun, 08 Feb 2009 22:34:12 +0000
+
 osm2go (0.6-11) unstable; urgency=low
 
   * New presets.xml