Index: trunk/scripts/git-migration/merges
===================================================================
--- trunk/scripts/git-migration/merges	(revision 1886)
+++ trunk/scripts/git-migration/merges	(revision 1887)
@@ -8,12 +8,8 @@
 # (n is translated into a revision using git rev-list --reverse
 # --skip=<n> | head -n 1)
-invirt-console-host	invirt-console	2
-invirt-console-server	invirt-console	0
-invirt-remote-host	invirt-remote	0
-invirt-remote-server	invirt-remote	0
-sipb-xen-autoinstaller	invirt-autoinstaller	0
+
 sipb-xen-base	invirt-base	0
+sipb-xen-console	invirt-console-server	0
 sipb-xen-console-server	invirt-console-host	0
-sipb-xen-console	invirt-console-server	0
 sipb-xen-database	invirt-database	0
 sipb-xen-dev	invirt-dev	0
@@ -30,2 +26,7 @@
 sipb-xen-vnc-server	invirt-vnc-server	0
 sipb-xen-www	invirt-web	0
+invirt-console-server	invirt-console	0
+invirt-console-host	invirt-console	2
+sipb-xen-autoinstaller	invirt-autoinstaller	0
+invirt-remote-host	invirt-remote	0
+invirt-remote-server	invirt-remote	0