[gnome-keyring: 9/9] Merge branch 'gnome-3-2'

[Stefan Walter <stefw src gnome org>]

commit d2128ffc09d4c9b4aa6b5a0ed2d81819a0a2af1d
Merge: 01d4e6d 81f51c7
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Nov 21 11:40:11 2011 +0100

    Merge branch 'gnome-3-2'

 NEWS                                       |    9 +++++++++
 configure.ac                               |    1 +
 daemon/gnome-keyring-gpg.desktop.in.in     |    2 +-
 daemon/gnome-keyring-pkcs11.desktop.in.in  |    2 +-
 daemon/gnome-keyring-secrets.desktop.in.in |    2 +-
 daemon/gnome-keyring-ssh.desktop.in.in     |    2 +-
 pkcs11/gkm/gkm-data-der.c                  |    2 +-
 pkcs11/secret-store/gkm-secret-binary.c    |    2 +-
 ui/gku-prompt-tool.c                       |   18 ++++++++++++------
 ui/tests/files/prompt-create               |   12 ++++++++++++
 10 files changed, 40 insertions(+), 12 deletions(-)
---
diff --cc NEWS
index d7f2536,3523393..24cc896
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,12 +1,21 @@@
 +Changes in version 3.3.1.1 are:
 + * Build correctly against glib 2.31
 +
 +Changes in version 3.3.1 are:
 + * Return most recent secret first when searching
 + * Split the Gcr and Gck libraries out of gnome-keyring
 + * Build fixes
 + * Updated translations
 +
+ Changes in version 3.2.2 are:
+  * Fix problem with 'unsafe storage' prompt deadlocking
+  * Remove XFCE & LXDE from OnlyShowIn for autostart files
+  * Use g_random_int_range() for pseudo-random hash iteration count
+  * Return password results with the most recent result first
+  * Make clear source of warnings from the rpc module
+  * Updated translations
+  * Build fixes
+ 
  Changes in version 3.2.1 are:
   * Fix debugging output, and erroneous warnings
   * Updated translations
diff --cc configure.ac
index e96c4b0,70be49e..ecb4772
--- a/configure.ac
+++ b/configure.ac
@@@ -1,6 -1,6 +1,7 @@@
  AC_INIT(daemon/gkd-main.c)
  
 -AM_INIT_AUTOMAKE(gnome-keyring, 3.2.2)
 +AM_INIT_AUTOMAKE(gnome-keyring, 3.3.2)
++
  AM_CONFIG_HEADER(config.h)
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])