[mutter/f17: 5/5] Merge branch 'master' into f17

[Adam Jackson]

commit 0d15d6950b1b94986be58916b8ba6d7f2da58113
Merge: 6540f99 0584516
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed May 9 17:51:40 2012 -0400

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

 mutter-never-slice-shape-mask.patch |   43 +++++
 mutter-use-cogl-texrect-api.patch   |  321 +++++++++++++++++++++++++++++++++++
 mutter.spec                         |   12 ++-
 3 files changed, 375 insertions(+), 1 deletions(-)
---