Merge branch 'gnome-3-6'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 24 Jan 2013 14:14:25 +0000 (15:14 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 24 Jan 2013 14:14:25 +0000 (15:14 +0100)

Trivial merge