[gnome-themes-standard: 10/10] Merge branch 'f18'

[Cosimo Cecchi]

commit 5285948bdaa462e8dfdb71d139b17b0bcea27ffe
Merge: 6228471 f4550f7
Author: Cosimo Cecchi <cosimoc at gnome.org>
Date:   Tue Oct 16 10:18:49 2012 -0400

    Merge branch 'f18'
    
    Conflicts:
    	gnome-themes-standard.spec
    	sources

 .gitignore                 |    6 ++++++
 gnome-themes-standard.spec |   28 ++++++++++++++++++++++++----
 sources                    |    2 +-
 3 files changed, 31 insertions(+), 5 deletions(-)
---