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

[Stefan Walter <stefw src gnome org>]

commit ef9b74c34fa396eb6fbf963864e2e9444f67df48
Merge: 8d7c2ac bfbefcf
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Apr 25 09:18:38 2011 +0200

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	configure.in
    	library/gkr-debug.c
    	library/gkr-operation.c
    	po/tr.po

 Makefile.am                              |    4 +-
 NEWS                                     |   10 ++
 configure.in                             |   27 +++--
 docs/reference/gnome-keyring/Makefile.am |    3 +-
 egg/tests/Makefile.am                    |    2 -
 egg/tests/test-dh.c                      |    6 +
 egg/tests/test-secmem.c                  |    3 +
 library/gkr-debug.c                      |   12 ++
 library/gkr-misc.c                       |    2 +-
 library/gkr-operation.c                  |  164 +++++++++++++++++++++++-------
 library/tests/Makefile.am                |    2 -
 11 files changed, 180 insertions(+), 55 deletions(-)
---