[gnome-keyring/dbus-api: 6/6] Merge branch 'master' into dbus-api

[Stefan Walter <stefw src gnome org>]

commit 996db6eebd41f5aaf2da9bb272a76be33d45666f
Merge: ace62ca... 1f22585...
Author: Stef Walter <stef memberwebs com>
Date:   Tue Nov 24 16:26:06 2009 +0000

    Merge branch 'master' into dbus-api

 .gitignore          |    2 +-
 daemon/gkr-daemon.c |   11 +-
 po/LINGUAS          |    1 +
 po/en shaw po       | 1260 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1272 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index f753421,ad30ba8..916cf03
--- a/.gitignore
+++ b/.gitignore
@@@ -27,9 -15,18 +27,9 @@@ run-prompt-test
  *-marshal.[ch]
  .libs
  .deps
- 
+ .anjuta*
  /compile
 -/*.tmp
 -/*.prj
 -/*.pws
 -/*.anjuta
 -/*.tar.gz
  /ABOUT-NLS
 -/Makefile
 -/Makefile.in
  /aclocal.m4
  /autom4te.cache
  /confdefs.h