[SCM] vlc/ubuntu: Release 1.1.7-3ubuntu1 to Ubuntu natty.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 7253e71370787c35f26ace1c22bb3654c83600f7
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Mar 6 13:53:30 2011 +0100

    Release 1.1.7-3ubuntu1 to Ubuntu natty.

diff --git a/debian/changelog b/debian/changelog
index 5be4a03..3118e79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vlc (1.1.7-3ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - build and install the libx264 plugin
+    - v4l is gone from the kernel. Build only v4l2.
+  * Disable xulrunner 1.9.1 patch.
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 06 Mar 2011 13:01:24 +0100
+
 vlc (1.1.7-3) unstable; urgency=low
 
   * adjust debian/source/local-options to team guidelines

-- 
VLC media player packaging