[libgnome-keyring: 7/7] Merge branch 'gnome-3-0'

[Stefan Walter <stefw src gnome org>]

commit f3c2b2d944aa8b5a215968308e1bbfef92f28428
Merge: 4c1d742 2c3bc67
Author: Stef Walter <stefw collabora co uk>
Date:   Thu May 26 18:02:10 2011 +0200

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	NEWS
    	configure.ac

 .gitignore                                         |    2 +
 NEWS                                               |    8 +++
 library/gnome-keyring.c                            |   12 ++++-
 library/tests/Makefile.am                          |    7 ++-
 .../tests/{test-any-daemon.c => frob-any-daemon.c} |    4 +-
 library/tests/frob-unlock-keyring.c                |   53 ++++++++++++++++++++
 6 files changed, 80 insertions(+), 6 deletions(-)
---
diff --cc NEWS
index 25c7f6e,a691986..2e18177
--- a/NEWS
+++ b/NEWS
@@@ -1,6 -1,11 +1,14 @@@
 +Changes in version 3.1.1 are:
 + * Build fixes.
 +
+ Changes in version 3.0.3 are:
+  * Add test tool for unlocking keyrings.
+  * Fix crasher for memory leak fix.
+ 
+ Changes in version 3.0.2 are:
+  * Fix memory leak
+  * Build fixes
+ 
  Changes in version 3.0.1 are:
   * Better testing configure options: --enable-tests=yes/no/full
   * Cleanup documentation warnings.