[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2

[Ralf Treinen]

The following commit has been merged in the master branch:
commit c4c33c2dd697f0d6425ca8aa19538b5b8d0a5bb6
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri May 13 21:22:47 2011 +0200

    add gb.conf to force pristine-tar

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True

-- 
maria packaging