changelog in X packages currently in testing has svn merge noise

["Nikita V. Youshchenko" <yoush@cs.msu.su>]

Looks like someone typed 'svn resolved' without actually resolving :).

<<<<<<< .working
 -- Fabio M. Di Nitto <fabbione@fabbione.net>  Thu, 09 Dec 2004 17:14:45
+0100
=======
 -- Fabio M. Di Nitto <fabbione@fabbione.net>  Thu,  9 Dec 2004 17:14:45
+0100
>>>>>>> .merge-right.r2073