[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-3-1-gdaee21c

[Modestas Vainius]

The following commit has been merged in the experimental-snapshots branch:
commit daee21ca9567ab1968f09d6aebf312cc4d61eab2
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jul 26 11:24:45 2010 +0300

    Use dpkg-mergechangelogs merge driver for the changelog.
    (cherry picked from commit ad64ad4954faad41a5fba44b43849484cd5863be)
---
 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

-- 
Qt 4 packaging