Merge branch 'gnome-3-10'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Dec 2013 16:00:04 +0000 (17:00 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 27 Dec 2013 16:00:04 +0000 (17:00 +0100)

Trivial merge