[seahorse: 13/13] Merge branch 'gnome-3-0'

[Stefan Walter <stefw src gnome org>]

commit f3b8f56cf37e91b87a2d88d4799b2f921eeb7985
Merge: a8c5bac 3bc5e80
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Apr 25 09:22:25 2011 +0200

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	po/da.po

 .gitignore                                  |    1 +
 NEWS                                        |   13 +++++++++++++
 configure.in                                |   14 ++++++++------
 gkr/seahorse-add-keyring.xml                |    1 -
 gkr/seahorse-gkr-add-item.xml               |    1 -
 gkr/seahorse-gkr-item-properties.xml        |    1 -
 gkr/seahorse-gkr-keyring.xml                |    1 -
 libcryptui/tests/cryptui-test-ui.c          |    2 +-
 libseahorse/seahorse-add-keyserver.xml      |    1 -
 libseahorse/seahorse-notify.xml             |    1 -
 libseahorse/seahorse-prefs.xml              |    1 -
 libseahorse/seahorse-progress.xml           |    1 -
 libseahorse/seahorse-util.c                 |    5 ++++-
 pgp/seahorse-add-subkey.xml                 |    1 -
 pgp/seahorse-add-uid.xml                    |    1 -
 pgp/seahorse-expires.xml                    |    1 -
 pgp/seahorse-pgp-generate.xml               |    1 -
 pgp/seahorse-pgp-private-key-properties.xml |    1 -
 pgp/seahorse-revoke.xml                     |    1 -
 pgp/seahorse-signer.xml                     |    1 -
 pkcs11/Makefile.am                          |    3 ++-
 src/seahorse-change-passphrase.xml          |    1 -
 src/seahorse-generate-select.xml            |    1 -
 src/seahorse-keyserver-search.xml           |    1 -
 src/seahorse-keyserver-sync.xml             |    1 -
 ssh/seahorse-ssh-generate.xml               |    1 -
 ssh/seahorse-ssh-key-properties.xml         |    1 -
 ssh/seahorse-ssh-upload.xml                 |    1 -
 28 files changed, 29 insertions(+), 31 deletions(-)
---