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

[Stefan Walter <stefw src gnome org>]

commit 78dd7109bd834f8c335137da06cdbc5f67f077fb
Merge: 1251b19... 0ac8ef2...
Author: Stef Walter <stef memberwebs com>
Date:   Sat Jun 27 19:44:51 2009 +0000

    Merge branch 'master' into dbus-api

 .gitignore                   |    1 -
 pkcs11/rpc-layer/Makefile.am |    3 +--
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 2296dcd,01f0002..2b50efa
--- a/.gitignore
+++ b/.gitignore
@@@ -66,5 -58,3 +66,4 @@@ Makefile.i
  run-prompt-test
  run-prompt-test.c
  run-prompt-test.h
 +*.stamp
-