[mate-conf/f18: 11/11] Merge branch 'master' into f18

[Rex Dieter]

commit f50013df511407a5ea4631033c8419b195aba163
Merge: 7aad7a2 570f22b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 27 14:45:50 2012 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	macros.mateconf

 macros.mateconf |  172 +++++++++++++++++++++++++++---------------------------
 mate-conf.spec  |   70 +++++++++-------------
 2 files changed, 114 insertions(+), 128 deletions(-)
---