Merge branch 'remove-stub-tests-41012'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 10:44:34 +0000 (11:44 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 10:44:38 +0000 (11:44 +0100)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41012
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

Trivial merge