[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3+svn20100502-3-14-g0c42aea

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit fe4c9cf84e7377f73c64f832c9bec7dbd7846bbd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 1 22:23:50 2010 +0200

    prepare new upload

diff --git a/debian/changelog b/debian/changelog
index 1af16ed..ac886b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mplayer (2:1.0~rc3+svn20100502-ubuntu1) maverick; urgency=low
+
+  * merge from debian
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 01 Jun 2010 22:23:42 +0200
+
 mplayer (2:1.0~rc3+svn20100502-4) unstable; urgency=low
 
   * copy in mencoder.c from upstream

-- 
mplayer packaging