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

[Dan Mashal]

commit b893b5c2239d90f53344c0103c102bcc5261aab3
Merge: 686edb5 bcc4ac7
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sat Feb 23 00:58:10 2013 -0800

    Merge branch 'master' into f17

 mate-applets.spec |   42 +++++++++++++++++++-----------------------
 1 files changed, 19 insertions(+), 23 deletions(-)
---