[mate-desktop/f17: 2/2] Merge branch 'master' into f17

[Wolfgang Ulbrich]

commit 0ced06bf829c92aaf00d3ce47397978ab99ed08f
Merge: b4ef721 ae7efce
Author: raveit <chat-to-me at raveit.de>
Date:   Sat Jun 15 23:52:38 2013 +0200

    Merge branch 'master' into f17

 mate-desktop.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---