[mate-keyring/f16: 24/24] Merge branch 'master' into f16

[Dan Mashal]

commit e3df8645b309a3b4911964fe47ce21d13cae0c84
Merge: bdb28c1 3deec22
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Nov 20 10:25:09 2012 -0800

    Merge branch 'master' into f16
    
    Conflicts:
    	.gitignore
    	mate-keyring.spec
    	sources

 .gitignore             |    4 +
 mate-keyring.spec      |  182 ++++++++++++++++++++++++------------------------
 sources                |    4 +
 upstream_commits.patch |   85 ++++++++++++++++++++++
 4 files changed, 185 insertions(+), 90 deletions(-)
---
diff --cc .gitignore
index cb065c6,d418460..fc3c6fe
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  /mate-keyring-1.4.0.tar.xz
++<<<<<<< HEAD
++=======
+ /mate-keyring-1.5.0.tar.xz
++>>>>>>> master
diff --cc sources
index 4a5f6c9,75bcd1c..c14547d
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +2055884ab8fb3532b59c591f60c90181  mate-keyring-1.4.0.tar.xz
++=======
+ 739e23a9163300c621e3e90f022143d8  mate-keyring-1.5.0.tar.xz
++>>>>>>> master