gnome-keyring r648 - in branches/cryptoki: . daemon keyrings tests

[nnielsen svn gnome org]

Author: nnielsen
Date: 2007-06-23 01:36:05 +0100 (Sat, 23 Jun 2007)
New Revision: 648
ViewCVS link: http://svn.gnome.org/viewcvs/gnome-keyring?rev=648&view=rev

Added:
   branches/cryptoki/tests/unit-test-daemon-setup.c
Modified:
   branches/cryptoki/ChangeLog
   branches/cryptoki/Makefile.am
   branches/cryptoki/configure.in
   branches/cryptoki/daemon/gnome-keyring-daemon-dbus.c
   branches/cryptoki/daemon/gnome-keyring-daemon-io.c
   branches/cryptoki/keyrings/gkr-keyrings.c
   branches/cryptoki/tests/Makefile.am
   branches/cryptoki/tests/unit-test-keyrings-prompt.c
   branches/cryptoki/tests/unit-test-keyrings.c
   branches/cryptoki/tests/unit-test-memory.c
   branches/cryptoki/tests/unit-test-other.c
   branches/cryptoki/tests/unit-test-secmem.c
   branches/cryptoki/tests/unit-tests-prep.sh
Log:
	* Merged revisions 645 - 647 from trunk.