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

[Dan Mashal]

commit 9e0794fa65b73de8490f7eede963e63b0665909e
Merge: 435b577 5d16127
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Mar 26 01:19:00 2013 -0700

    Merge branch 'master' into f17

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