[mate-window-manager/f17: 4/4] Merge branch 'master' into f17

[Rex Dieter]

commit e75e9a5f1244c8715b55e3876d2e502417adfab0
Merge: 9ff9cc0 6b58520
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 27 09:11:50 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	mate-window-manager.spec

 mate-window-manager.spec |   67 ++++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 29 deletions(-)
---