Merge branch 'leak-fixes-33126'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 17 Feb 2011 17:19:13 +0000 (17:19 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 17 Feb 2011 17:19:15 +0000 (17:19 +0000)
Reviewed-by: Colin Walters <walters@verbum.org>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126


Trivial merge