[gvfs/wip/udisks2: 7/8] Merge branch 'master' into wip/udisks2

[David Zeuthen <davidz src gnome org>]

commit edda2efe789bbc40666119b3e6aea9fdf5a13efa
Merge: 90e8e59 b19d6cf
Author: David Zeuthen <davidz redhat com>
Date:   Tue Nov 29 16:37:47 2011 -0500

    Merge branch 'master' into wip/udisks2

 client/gvfsfusedaemon.c        |    2 +-
 common/gmountsource.c          |    6 +
 common/gmounttracker.c         |    1 +
 daemon/gvfsbackendafc.c        |    2 +
 daemon/gvfsbackendftp.c        |    2 +
 daemon/gvfsbackendgphoto2.c    |    2 +
 daemon/gvfsbackendhttp.c       |    7 +
 daemon/gvfsbackendnetwork.c    |    2 +
 daemon/gvfsbackendobexftp.c    |    3 +
 daemon/gvfsbackendsmbbrowse.c  |    3 +
 daemon/gvfsdaemon.c            |    2 +
 daemon/gvfsftpdircache.c       |    1 +
 daemon/mount.c                 |    3 +-
 daemon/trashlib/trashexpunge.c |    3 -
 po/he.po                       |  362 ++++++++++++++++++++--------------------
 po/hu.po                       |    2 +-
 po/ko.po                       |  110 ++++---------
 17 files changed, 248 insertions(+), 265 deletions(-)
---