[mutter: 7/7] Merge branch 'f21'

[drago01]

commit 3b22485755a04ab281fab47382abd71a9d8502f6
Merge: 568a598 64e6165
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Tue Aug 26 19:18:08 2014 +0200

    Merge branch 'f21'
    
    Conflicts:
    	mutter.spec

 ...e-actor-Fix-is_argb32-for-unredirected-wi.patch |   43 ++++++++++++++++++++
 mutter.spec                                        |    8 +++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --cc mutter.spec
index d43f65f,4fcfd8f..4e13847
--- a/mutter.spec
+++ b/mutter.spec
@@@ -12,7 -12,8 +12,9 @@@ URL:           http://www.gnome.or
  Source0:       http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz
  # rhbz1103221 From upstream git, drop when rebasing
  Patch1:        0001-workspace-Smarten-assert-in-light-of-O-R-windows.patch
+ Patch2:        0001-meta-surface-actor-Fix-is_argb32-for-unredirected-wi.patch
+ 
 +
  BuildRequires: clutter-devel >= %{clutter_version}
  BuildRequires: pango-devel
  BuildRequires: startup-notification-devel