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

[Rex Dieter]

commit fc6a24e9a8064ab4247d1a5a6d0a9147b04abaad
Merge: c01ec58 b364230
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Apr 13 15:24:51 2013 -0500

    Merge branch 'f18' into f17

 mate-keyring.spec                   |   24 +-
 mate-keyring_fix_desktop-file.patch |   48 -
 mk_commits_rollup.patch             | 7692 -----------------------------------
 upstream_commits.patch              |   85 -
 4 files changed, 12 insertions(+), 7837 deletions(-)
---