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

[leigh123linux]

commit 097061d17f630ee0e863d91a32a692041e09c4a5
Merge: 8082932 d1f67a1
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 23 19:12:17 2012 +0100

    Merge branch 'master' into f17

 mate-keyring.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---