[SCM] grass branch, master, updated. upstream/6.4.1-111-g6d11595

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 6d1159522b58cf204ec29b976f13c7b3793ea7d7
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Wed Jun 27 08:48:05 2012 +1200

    minor whitespace

diff --git a/debian/control b/debian/control
index 710eba1..b97bf1a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-depends:
   libcairo2-dev,
   libfftw3-dev,
   libfreetype6-dev,
-  libgdal-dev| libgdal1-dev (>= 1.5.0),
+  libgdal-dev | libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev,
   libpng-dev | libpng12-dev,
diff --git a/debian/control.in b/debian/control.in
index 4297976..10d6ce3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Build-depends:
   libcairo2-dev,
   libfftw3-dev,
   libfreetype6-dev,
-  libgdal-dev| libgdal1-dev (>= 1.5.0),
+  libgdal-dev | libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev,
   libpng-dev | libpng12-dev,

-- 
Geographic Resources Analysis Support System