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

[Dan Mashal]

commit 831dbd73b676db26f7f8b4893f2049987167cbd4
Merge: dec6f9c 4fb1947
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Oct 22 21:18:32 2012 -0400

    Merge branch 'master' into f17

 mate-keyring.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---