Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Mon, 9 May 2011 09:05:05 +0000 (11:05 +0200)
committerStef Walter <stefw@collabora.co.uk>
Mon, 9 May 2011 09:05:05 +0000 (11:05 +0200)
commitd859db4d4e4f5b412aeca862bc5a43d7f0b7bb88
tree5405a4a322e3f6b93bc8aa71b98eaaaee2dd3825
parentf8fdfd68c07d89d4fc50f10a4eb45408efc8f992
parentdf18a413f0d29947bf6b9e071f8e5a7ddd32c03d
Merge branch 'gnome-3-0'

Conflicts:
gck/Makefile.am
gcr/Makefile.am
gcr/Makefile.am