[seahorse: 5/5] Merge branch 'gnome-3-6'

[Stefan Walter <stefw src gnome org>]

commit 013bc421ce9117ebdeae780813629e23b75a556f
Merge: e1db111 0c64651
Author: Stef Walter <stefw gnome org>
Date:   Mon Oct 22 21:00:52 2012 +0200

    Merge branch 'gnome-3-6'

 NEWS                                     |    7 +++++++
 configure.ac                             |    2 +-
 gkr/seahorse-gkr-actions.c               |    4 ++--
 gkr/seahorse-gkr-add-item.c              |   16 ++++++++--------
 gkr/seahorse-gkr-item-properties.c       |    2 ++
 libseahorse/seahorse-key-manager-store.c |    1 +
 libseahorse/seahorse-util.c              |    1 +
 pgp/seahorse-keyserver-results.c         |    1 +
 8 files changed, 23 insertions(+), 11 deletions(-)
---