[empathy: 2/2] Merge branch 'crash-659118'

[Danielle Madeley <daniellem src gnome org>]

commit e3598826ad6ede2f72fbee91c528e621f6dce926
Merge: f9c3f78 3783932
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Wed Sep 21 08:32:59 2011 +1000

    Merge branch 'crash-659118'
    
    Freeze exception signed off by Andre Klapper <ak-47 gmx net> and
    Matthias Clasen <matthias clasen gmail com>

 src/empathy-main-window.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---