Merge branch 'gnome-3-4'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Apr 2012 12:00:41 +0000 (14:00 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 16 Apr 2012 12:00:41 +0000 (14:00 +0200)
Conflicts:
configure.ac
po/sk.po
po/zh_CN.po


Trivial merge