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

[Dan Mashal]

commit 7aa722fa1642a01f8a5e56695f875e00a0b79df0
Merge: b893b5c a37ae62
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Mar 11 05:29:42 2013 -0700

    Merge branch 'master' into f17

 .gitignore        |    1 +
 mate-applets.spec |    8 +++++---
 sources           |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---