[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.6-1-54-g45d7106

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b9cf1194cde781a055aae36e8a4c4a132e584cf2
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Jun 24 00:49:13 2010 +0200

    Remove unused bzr-builddeb config.

diff --git a/debian/.bzr-builddeb/default.conf b/debian/.bzr-builddeb/default.conf
deleted file mode 100644
index 3165e05..0000000
--- a/debian/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[BUILDDEB]
-merge = True

-- 
VLC media player packaging