[mate-desktop/f18] merge master into f18

[Dan Mashal]

commit 32f8911489c6e567cd330290857d240a229cfde6
Author: dmashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 24 10:51:07 2012 -0700

    merge master into f18

 mate-desktop.spec |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 6c8739b..8871197 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,16 +1,7 @@
-<<<<<<< HEAD
-%global po_package mate-desktop-2.0
-=======
->>>>>>> master
-
 Summary:	Shared code among gnome-panel, gnome-session, nautilus, etc
 Name:		mate-desktop
 Version:	1.4.1
-<<<<<<< HEAD
-Release:	10%{?dist}
-=======
 Release:	11%{?dist}
->>>>>>> master
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz