[vinagre/ssh: 6/6] Merge branch 'master' into ssh

[Jonh Wendell <jwendell src gnome org>]

commit 407cf9cb7ad8ab06dd73b95ec6d8b87d40932d51
Merge: f1025ba... a8e9bb3...
Author: Jonh Wendell <jwendell gnome org>
Date:   Fri Jul 31 20:24:09 2009 -0300

    Merge branch 'master' into ssh

 vinagre/vinagre-connection.c |   36 ------------------------------------
 vinagre/vinagre-connection.h |    3 ---
 vinagre/vinagre-fav.c        |   12 ++++++++++--
 vinagre/vinagre-plugin.c     |   31 +++++++++++++++++++++++++++++++
 vinagre/vinagre-plugin.h     |    3 +++
 vinagre/vinagre-window.c     |   14 ++++++++++----
 6 files changed, 54 insertions(+), 45 deletions(-)
---