Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)
committerStef Walter <stefw@collabora.co.uk>
Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)
commitb31945a1fb55c38ef660eb78b5c198fa0994b8a4
tree4f9a4c79d6b22c8f64a0c0e358e6b86f59515132
parent7c8c92a725803a78888ed4a7d83af57514f93244
parenteb3eb51c85a6ae016f646e097bede5d995572efb
Merge branch 'gnome-3-0'
gcr/gcr-importer.c
gcr/gcr-parser.c