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

[Dan Mashal]

commit e63aa4fcb7680c94b8af9d75f66d5c4576c18d5a
Merge: 48b2eea 0e29463
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Nov 22 17:52:53 2012 -0800

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

 .gitignore                                         |    1 +
 ...p-rendering-effect-with-composite-enabled.patch |   25 ++++
 mate-window-manager.spec                           |  125 +++++++++++---------
 sources                                            |    2 +-
 4 files changed, 97 insertions(+), 56 deletions(-)
---