[gnome-keyring] (10 commits) ...Merge branch 'gnome-3-0'

[Stefan Walter <stefw src gnome org>]

Summary of changes:

  2c7a6d8... rpc-layer: Fix bad handshake length macro. (*)
  eb11123... gcr: In test-parser don't try to parse directories. (*)
  1079959... gcr: Fix remaining references to test-data directory (*)
  1cfa84f... Remove #include <config.h> from headers to make sure it's n
  c8bdfed... Remove #include <config.h> from headers to make sure it's n (*)
  33c2185... fix unused-but-set-variable warnings (*)
  22c86f2... egg: Run the hkdf tests (*)
  fcfe398... Expand path in gnome-keyring-prompt.desktop properly (*)
  433e014... gck: Fix linking issue due to type in Makefile. (*)
  2a45c4b... Merge branch 'gnome-3-0'

(*) This commit already existed in another branch; no separate mail sent