[SCM] Phonon Multimedia Framework packaging branch, master, updated. debian/4.6.0really4.4.2-1-6-g874588b

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 874588b38498ce9d571230f3966c197d76c8a08f
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jul 26 23:46:29 2010 +0300

    Use dpkg-mergechangelogs merge driver for the changelog.
---
 debian/.gitattributes |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs

-- 
Phonon Multimedia Framework packaging