merge: fix number of defects found by Coverity scan (bgo #741122)
authorJiří Klimeš <jklimes@redhat.com>
Fri, 5 Dec 2014 08:39:12 +0000 (09:39 +0100)
committerJiří Klimeš <jklimes@redhat.com>
Fri, 5 Dec 2014 08:39:12 +0000 (09:39 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=741122


Trivial merge