[grass/f15: 4/4] Merge branch 'master' into f15

[Volker Fröhlich]

commit 88771f1739cc407258d6652ddf65fd6da34cd8e5
Merge: 3fe145f a4755d9
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Mon Sep 12 08:26:56 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	grass.spec

 grass-gcc44.patch          |   15 ---
 grass-gdilib.patch         |   11 --
 grass.desktop              |   29 +-----
 grass.spec                 |  242 ++++++++++++++++++++++++--------------------
 grasslogo_vector_small.png |  Bin 6514 -> 0 bytes
 5 files changed, 138 insertions(+), 159 deletions(-)
---