[mate-applets/f18: 2/2] Merge branch 'master' into f18

[Dan Horák]

commit f7ffd81d11e94a26b9fa6a6202422175d055819a
Merge: 8cbbc3b a8146c5
Author: Dan Horák <dan at danny.cz>
Date:   Sun Jun 2 23:32:07 2013 +0200

    Merge branch 'master' into f18

 mate-applets.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---