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

[David Zeuthen <davidz src gnome org>]

commit ea4e18b0f452ca8058a28a2202ef858df57b837d
Merge: 5dda97b a76da48
Author: David Zeuthen <davidz redhat com>
Date:   Wed Oct 26 15:09:24 2011 -0400

    Merge branch 'master' into wip/udisks2

 NEWS                                         |    9 +
 client/gdaemonfileenumerator.c               |    2 +-
 client/gdaemonfilemonitor.c                  |    2 +-
 client/gdaemonvfs.c                          |    5 +-
 client/gvfsdaemondbus.c                      |   15 +-
 client/gvfsfusedaemon.c                      |   83 +-
 common/gmountsource.c                        |   60 +-
 common/gmounttracker.c                       |   43 +-
 configure.ac                                 |    4 +-
 daemon/daemon-main.c                         |    1 -
 daemon/gvfsbackendafc.c                      |   22 +-
 daemon/gvfsbackendftp.c                      |   12 +-
 daemon/gvfsbackendftp.h                      |    4 +-
 daemon/gvfsbackendgphoto2.c                  |  112 +-
 daemon/gvfsbackendnetwork.c                  |   10 +-
 daemon/gvfsbackendobexftp.c                  |  187 ++--
 daemon/gvfsbackendsmbbrowse.c                |   39 +-
 daemon/gvfsdaemon.c                          |   33 +-
 daemon/gvfsdaemonutils.c                     |    8 +-
 daemon/gvfsftpconnection.c                   |    2 +-
 daemon/gvfsftpdircache.c                     |   21 +-
 daemon/gvfsftptask.c                         |   33 +-
 daemon/gvfsmonitor.c                         |    2 +-
 daemon/main.c                                |    2 -
 daemon/trashlib/trashexpunge.c               |   35 +-
 daemon/trashlib/trashitem.c                  |   36 +-
 metadata/metatree.c                          |   60 +-
 monitor/proxy/gvfsproxyvolumemonitordaemon.c |    1 -
 po/he.po                                     | 1683 ++++++++++++++++++--------
 po/te.po                                     | 1567 ++++++++++++++++--------
 30 files changed, 2601 insertions(+), 1492 deletions(-)
---