[mate-desktop/f18: 11/11] Merge branch 'master' into f18

[Dan Mashal]

commit 7efc84dceabbddcbb460505df43bd58951d024bb
Merge: c091c38 c90b064
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Thu May 23 19:37:17 2013 -0700

    Merge branch 'master' into f18

 .gitignore                       |    2 +
 gnu-cat.gif                      |  Bin 0 -> 7385 bytes
 gnu-cat_navideno_v3.png          |  Bin 0 -> 1354 bytes
 mate-desktop.spec                |  132 ++++++++++++++++++++++------------
 mate-desktop_enable_gnucat.patch |  147 ++++++++++++++++++++++++++++++++++++++
 mate-fedora1.gschema.override    |    9 +++
 sources                          |    2 +-
 7 files changed, 246 insertions(+), 46 deletions(-)
---