[gnome-keyring: 12/12] Merge branch 'gnome-2-26'

[Stefan Walter <stefw src gnome org>]

commit 2e331bf3f47d7ae91f4939919c3a43c86199a4e0
Merge: 7a71860... e26bf33...
Author: Stefan Walter <Stefan Walter>
Date:   Sun May 3 14:51:23 2009 -0500

    Merge branch 'gnome-2-26'
    
    Conflicts:
    	ChangeLog
    	po/ca valencia po
    	po/uk.po

 NEWS                                     |   12 +
 configure.in                             |    4 +-
 daemon/gkr-daemon-dbus.c                 |   90 +++++--
 daemon/gkr-daemon-ops.c                  |    8 +-
 daemon/org.gnome.keyring.service.in      |    2 +-
 docs/reference/gcr/Makefile.am           |    2 +-
 docs/reference/gnome-keyring/Makefile.am |    2 +-
 docs/reference/gp11/Makefile.am          |    2 +-
 egg/egg-secure-memory.c                  |    2 +-
 egg/tests/unit-test-secmem.c             |    4 +-
 gcr/gcr-certificate.c                    |  185 ++++++++++++++
 po/ChangeLog                             |    2 +
 po/te.po                                 |  399 +++++++++++++++---------------
 tests/dbus-test.py                       |   16 ++
 14 files changed, 486 insertions(+), 244 deletions(-)