[gnome-keyring/trust-store: 4/7] Merge branch 'master' into trust-store

[Stefan Walter <stefw src gnome org>]

commit dc618d06a2293d9d315da431c94b2bb5f507b428
Merge: 5470f81 a47bf28
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Dec 13 18:58:43 2010 +0000

    Merge branch 'master' into trust-store

 egg/egg-asn1x.c              |   25 ++++++++++++++-----------
 gcr/tests/unit-test-parser.c |    2 ++
 testing/testing.c            |    1 +
 3 files changed, 17 insertions(+), 11 deletions(-)
---