[mate-panel/f17: 3/3] Merge branch 'master' into f17

[Dan Mashal]

commit 435b577b1a3d09f033d800ff1f2916ecdaa33e47
Merge: 642e2f7 935af04
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sat Feb 23 06:15:29 2013 -0800

    Merge branch 'master' into f17

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