[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090110-20-g8de5a25

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8de5a250b832720467e0a776af1b0099d65bc07e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 12 07:44:16 2009 +0100

    remove debian/.bzr-builddeb/default.conf, no longer useful

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

-- 
FFmpeg packaging