[gnome-keyring/trust-store: 17/26] Merge branch 'master' into trust-store

[Stefan Walter <stefw src gnome org>]

commit dc3e7af8a1c631fc01230208d4b5a90b243bf3b2
Merge: 84f4415 4d1f139
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Dec 6 19:17:06 2010 +0000

    Merge branch 'master' into trust-store

 Makefile.am                         |    4 +-
 NEWS                                |    6 +
 configure.in                        |   20 +-
 daemon/Makefile.am                  |   10 +
 daemon/control/gkd-control-server.c |    1 +
 daemon/gkd-capability.c             |  119 ++++
 daemon/gkd-capability.h             |   27 +
 daemon/gkd-main.c                   |    7 +
 gcr/gcr-display-view.c              |    5 +
 pkcs11/gkm/gkm-timer.c              |   11 +-
 po/LINGUAS                          |    1 +
 po/et.po                            |  167 +++---
 po/ro.po                            | 1172 +++++++++++++++++++++--------------
 po/sl.po                            |  408 +++++++------
 po/ug.po                            | 1032 ++++++++++++++++++++++++++++++
 ui/gku-prompt.ui                    |    1 -
 16 files changed, 2236 insertions(+), 755 deletions(-)
---