Merge remote-tracking branch 'origin/master'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 4 Oct 2012 07:55:49 +0000 (08:55 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 4 Oct 2012 07:55:49 +0000 (08:55 +0100)

Trivial merge