Merge branch 'gnome-3-4'
authorStef Walter <stefw@gnome.org>
Sat, 30 Jun 2012 11:35:36 +0000 (13:35 +0200)
committerStef Walter <stefw@gnome.org>
Sat, 30 Jun 2012 11:35:36 +0000 (13:35 +0200)

Trivial merge