Merge branch 'gnome-3-0'
authorStef Walter <stefw@collabora.co.uk>
Tue, 5 Apr 2011 16:30:36 +0000 (18:30 +0200)
committerStef Walter <stefw@collabora.co.uk>
Tue, 5 Apr 2011 16:30:36 +0000 (18:30 +0200)
commit489df387400f8e1aff2ac211426f647128a08f4c
tree34bacfe6e9b37da748a333af49d60a72b7c99be6
parent49f0b0ee0c08e23083053e4948c7b6f44d366f20
parentc14e6d53b08060758004724987e2facedcecd8e3
Merge branch 'gnome-3-0'
gcr/gcr-display-view.c