platform: merge branch 'th/bgo706293_platform_tests'
authorThomas Haller <thaller@redhat.com>
Thu, 5 Jun 2014 16:13:26 +0000 (18:13 +0200)
committerThomas Haller <thaller@redhat.com>
Thu, 5 Jun 2014 16:13:26 +0000 (18:13 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=706293

Signed-off-by: Thomas Haller <thaller@redhat.com>

Trivial merge