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

[Dan Mashal]

commit f4ded18a47785037cd0bb93e1122a5dc32f60130
Merge: 7efc84d 1b3597d
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sat May 25 14:11:04 2013 -0700

    Merge branch 'master' into f18

 mate-desktop.spec                                  |   25 ++++++++++++++++----
 ...schema.override => mate-fedora.gschema.override |    0
 2 files changed, 20 insertions(+), 5 deletions(-)
---