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

[Dan Mashal]

commit dec6f9c1202f52456eaf7de8cbcaf9117243073b
Merge: c13f55a b3a9a2c
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Oct 22 20:59:30 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	mate-keyring.spec

 mate-keyring.spec |  119 +++++++++++++++++++----------------------------------
 1 files changed, 43 insertions(+), 76 deletions(-)
---