Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Thu, 26 May 2011 16:04:45 +0000 (18:04 +0200)
committerStef Walter <stefw@collabora.co.uk>
Thu, 26 May 2011 16:04:45 +0000 (18:04 +0200)
commit7c8c92a725803a78888ed4a7d83af57514f93244
treed29a0033b1fc46be39aef686379d375498f8e410
parent9d3ad04deff9e25e49812857e4461ca7f263cf13
parent96ef605a5173972e607baf3764184b68f386ae05
Merge branch 'gnome-3-0'

Conflicts:
NEWS
configure.ac
docs/reference/gcr/Makefile.am
docs/reference/gcr/gcr-visual-index.xml
docs/reference/gcr/gcr-widgets.c
docs/reference/gcr/images/key-widget.png
gcr/Makefile.am
gcr/Makefile.am
gcr/gcr-library.c