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

[Stefan Walter <stefw src gnome org>]

commit a448d02af2414291fb77890e1034620b475147e2
Merge: c0622ce... c33349f...
Author: Stefan Walter <stef ws local>
Date:   Sun Nov 15 16:10:04 2009 +0000

    Merge branch 'master' into dbus-api

 .gitignore                            |    7 ++++++-
 pkcs11/gck/tests/unit-test-data-der.c |    3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 8e02df0,bfbe89e..f753421
--- a/.gitignore
+++ b/.gitignore
@@@ -3,28 -4,29 +3,33 @@@
  *.la
  *.lo
  *.a
 -.*project
 +*.bak
- *.tmp
+ *.Po
+ *.Plo
 +*.prj
 +*.pws
++*.tmp
 +*.anjuta
 +.anjuta*
 +*.tar.gz
 +.*project
  .settings
  *.orig
 +*.stamp
 +.deps
 +.libs
 +stamp-*
 +Makefile
 +Makefile.in
  core
  run-auto-test*
  run-prompt-test*
 -Makefile
 -Makefile.in
+ *-marshal.[ch]
+ .libs
+ .deps
  
  /compile
 -/*.tmp
 -/*.prj
 -/*.pws
 -/*.anjuta
 -/*.tar.gz
  /ABOUT-NLS
 -/Makefile
 -/Makefile.in
  /aclocal.m4
  /autom4te.cache
  /confdefs.h