[grass/f17: 3/3] Merge branch 'master' into f17

[Volker Fröhlich]

commit 7a437c3c6e40a8913a698c959f19d8edb504523a
Merge: 7a8232a 0b2a31f
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sun Mar 4 23:51:52 2012 +0100

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

 grass.spec |   49 +++++++++++++++++++++----------------------------
 1 files changed, 21 insertions(+), 28 deletions(-)
---