[empathy: 3/3] Merge branch 'escape-notifications'

[Will Thompson <wjt src gnome org>]

commit 52a4fda0785b6e49be175221350c8f90d7982527
Merge: 0d01019... faef888...
Author: Will Thompson <will thompson collabora co uk>
Date:   Thu Aug 6 13:02:52 2009 +0100

    Merge branch 'escape-notifications'
    
    Fixes #580134
    
    Reviewed-by: Guillaume Desmottes <guillaume desmottes collabora co uk>

 src/empathy-chat-window.c |   16 +++++++---------
 src/empathy-status-icon.c |   32 +++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 22 deletions(-)
---