[gnome-keyring: 11/12] Merge branch 'sort-values'

[Stefan Walter <stefw src gnome org>]

commit 325533c3e934ee90da403e0355f18b1c5bd0cb68
Merge: 3e0d0bb 03b4084
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Sep 19 09:36:43 2011 +0200

    Merge branch 'sort-values'

 docs/reference/gck/gck-sections.txt |    2 +
 docs/reference/gcr/gcr-sections.txt |   31 +-
 gck/gck-module.c                    |   31 ++
 gck/gck-slot.c                      |   38 ++
 gck/gck.h                           |   14 +-
 gcr/Makefile.am                     |    2 +
 gcr/gcr-collection-model.c          | 1002 +++++++++++++++++++++++++++++------
 gcr/gcr-collection-model.h          |    4 +-
 gcr/gcr-collection.c                |   19 +
 gcr/gcr-collection.h                |   10 +-
 gcr/gcr-deprecated.h                |    4 +
 gcr/gcr-gnupg-collection.c          |   17 +
 gcr/gcr-simple-collection.c         |   14 +-
 gcr/gcr-simple-collection.h         |    3 -
 gcr/gcr-tree-selector.c             |  103 +----
 gcr/gcr-union-collection.c          |  341 ++++++++++++
 gcr/gcr-union-collection.h          |   76 +++
 gcr/gcr.h                           |    1 +
 gcr/tests/frob-tree-selector.c      |  118 ++++-
 19 files changed, 1534 insertions(+), 296 deletions(-)
---