[SCM] snaphu branch, master, updated. upstream/1.4.2-9-g73bc6f4

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 73bc6f49c096d33d6567460c1b6793cfdff5b103
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Aug 7 19:44:20 2011 +0200

    Added local options file in debian/source

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

-- 
Statistical-Cost, Netowrk-Flow Algorithm for Phase Unwrapping