[mate-control-center/f19: 6/6] Merge branch 'master' into f19

[Dan Mashal]

commit 3bf300f3c709bfb2534b9ee34313fd79f060d129
Merge: f07688c c0f7404
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Fri Apr 5 19:42:43 2013 -0700

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	mate-control-center.spec
    	sources

 .gitignore               |    4 ++
 mate-control-center.spec |   74 +++++++++++++++++-----------------------------
 sources                  |    4 ++
 3 files changed, 35 insertions(+), 47 deletions(-)
---
diff --cc .gitignore
index e7142b4,d389162..69c11da
--- a/.gitignore
+++ b/.gitignore
@@@ -5,3 -5,4 +5,7 @@@
  /mate-control-center-1.5.3.tar.xz
  /mate-control-center-1.5.4.tar.xz
  /mate-control-center-1.5.5.tar.xz
++<<<<<<< HEAD
++=======
+ /mate-control-center-1.6.0.tar.xz
++>>>>>>> master
diff --cc sources
index a46d95d,7a0e5a3..74c981d
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +ea05c8c897bc2ce06297a617e5e6de13  mate-control-center-1.5.5.tar.xz
++=======
+ 02f4b38579e1aa1b3d008f82c4831359  mate-control-center-1.6.0.tar.xz
++>>>>>>> master