Merge branch 'gnome-3-2'
authorStef Walter <stefw@collabora.co.uk>
Mon, 26 Sep 2011 09:47:56 +0000 (11:47 +0200)
committerStef Walter <stefw@collabora.co.uk>
Mon, 26 Sep 2011 09:47:56 +0000 (11:47 +0200)

Trivial merge