[anjal: 6/6] Merge branch 'leak-fixes'

[Jonathon Jongsma <jjongsma src gnome org>]

commit 296e9231a1a213a9ab8cef5c112c7b1951eabbc7
Merge: 39bd478... 535cdb6...
Author: Jonathon Jongsma <jonathon jongsma collabora co uk>
Date:   Mon Nov 2 11:52:22 2009 -0600

    Merge branch 'leak-fixes'

 src/custom-cell-renderer-vbox.c |    7 ++++---
 src/em-tree-store.c             |    2 ++
 src/mail-folder-view.c          |   23 ++++++++++++++++++-----
 src/main.c                      |    5 ++++-
 4 files changed, 28 insertions(+), 9 deletions(-)
---