diff -u phpmyadmin-2.10.3/debian/install phpmyadmin-2.10.3/debian/install
--- phpmyadmin-2.10.3/debian/install
+++ phpmyadmin-2.10.3/debian/install
@@ -1,5 +1,5 @@
 *.php		usr/share/phpmyadmin
-*.ico		usr/share/phpmyadmin
+favicon.ico	usr/share/phpmyadmin
 
 css		usr/share/phpmyadmin
 js		usr/share/phpmyadmin
diff -u phpmyadmin-2.10.3/debian/control phpmyadmin-2.10.3/debian/control
--- phpmyadmin-2.10.3/debian/control
+++ phpmyadmin-2.10.3/debian/control
@@ -1,5 +1,6 @@
 Source: phpmyadmin
-Maintainer: Thijs Kinkhorst <thijs@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Thijs Kinkhorst <thijs@debian.org>
 Uploaders: Michal Čihař <nijel@debian.org>
 Section: web
 Priority: extra
diff -u phpmyadmin-2.10.3/debian/changelog phpmyadmin-2.10.3/debian/changelog
--- phpmyadmin-2.10.3/debian/changelog
+++ phpmyadmin-2.10.3/debian/changelog
@@ -1,3 +1,11 @@
+phpmyadmin (4:2.10.3-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Add missing favicon.ico (Closes: LP #124402).
+    - Update maintainer field in debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Sat, 21 Jul 2007 02:24:57 +0200
+
 phpmyadmin (4:2.10.3-1) unstable; urgency=low
 
   * New upstream bugfix release.
@@ -7,6 +15,12 @@
 
  -- Thijs Kinkhorst <thijs@debian.org>  Sat, 14 Jul 2007 18:07:05 +0200
 
+phpmyadmin (4:2.10.2-1ubuntu1) gutsy; urgency=low
+
+  * Added missing favicon.ico (Closes: LP #124402).
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 06 Jul 2007 11:50:34 -0400
+
 phpmyadmin (4:2.10.2-1) unstable; urgency=low
   
   [ Thijs Kinkhorst ]