Merge branch 'gnome-3-0'

author Stef Walter <stefw@collabora.co.uk>

Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)

committer Stef Walter <stefw@collabora.co.uk>

Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)
author Stef Walter <stefw@collabora.co.uk>
Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)
committer Stef Walter <stefw@collabora.co.uk>
Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)
diff --cc gcr/gcr-importer.c
Simple merge
diff --cc gcr/gcr-parser.c
Simple merge
author	Stef Walter <stefw@collabora.co.uk>
	Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)
committer	Stef Walter <stefw@collabora.co.uk>
	Tue, 31 May 2011 08:05:28 +0000 (10:05 +0200)
		1	2
gcr/gcr-importer.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcr/gcr-parser.c	patch \|	diff1 \|	diff2 \|	blob \| history