xorg: Changes to 'refs/tags/xorg-1_7.1.0-16'

[Julien Cristau <jcristau@alioth.debian.org>]

Rebased ref, commits from common ancestor:
commit 5658d1fd2998a50fc10526c8740114185c41e34b
Author: Julien Cristau <jcristau@debian.org>
Date:   Tue Apr 3 14:07:33 2007 +0200

    Add bug closer for #417564.

diff --git a/debian/changelog b/debian/changelog
index 1aef5ac..d3111a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,10 @@ xorg (1:7.1.0-16) unstable; urgency=high
     Romanian. Closes: #416544
 
   [ Julien Cristau ]
-  * Add x11-common conflict with ucbmpeg-play << 2.3p-13.
+  * Add x11-common conflict with ucbmpeg-play << 2.3p-13 (closes: #417564).
   * Urgency high to get this into etch.
 
- -- Julien Cristau <jcristau@debian.org>  Tue, 03 Apr 2007 12:54:35 +0200
+ -- Julien Cristau <jcristau@debian.org>  Tue, 03 Apr 2007 14:06:17 +0200
 
 xorg (1:7.1.0-15) unstable; urgency=low