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

[David Zeuthen <davidz src gnome org>]

commit b8ab85bc14d6df1febaaad90359141a4905aeb27
Merge: 981b950 2b5e26a
Author: David Zeuthen <davidz redhat com>
Date:   Tue Oct 18 14:39:42 2011 -0400

    Merge branch 'master' into wip/udisks2

 configure.ac                                 |    2 +-
 monitor/proxy/gproxydrive.c                  |   40 +-
 monitor/proxy/gproxymount.c                  |   26 +
 monitor/proxy/gproxyshadowmount.c            |   14 +
 monitor/proxy/gproxyvolume.c                 |   27 +
 monitor/proxy/gproxyvolumemonitor.c          |   24 +
 monitor/proxy/gvfsproxyvolumemonitordaemon.c |   46 +-
 po/vi.po                                     | 1208 +++++++++++++++++---------
 programs/gvfs-mount.c                        |   13 +
 9 files changed, 964 insertions(+), 436 deletions(-)
---