merge branch 'th/kill_child'
authorThomas Haller <thaller@redhat.com>
Thu, 10 Jul 2014 14:33:37 +0000 (16:33 +0200)
committerThomas Haller <thaller@redhat.com>
Thu, 10 Jul 2014 14:33:45 +0000 (16:33 +0200)
https://bugzilla.gnome.org/show_bug.cgi?id=725660

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

Trivial merge