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

[David Zeuthen <davidz src gnome org>]

commit 0d8d5b678dcdb67b95c5863dcab8463842529e66
Merge: e56eb56 42d800f
Author: David Zeuthen <davidz redhat com>
Date:   Fri Oct 14 10:28:07 2011 -0400

    Merge branch 'master' into wip/udisks2

 autogen.sh                  |    2 +-
 client/Makefile.am          |    4 ++--
 client/gvfsfusedaemon.c     |    2 --
 common/Makefile.am          |    2 +-
 daemon/Makefile.am          |    5 ++---
 daemon/gvfsjobunmount.c     |    4 +++-
 metadata/Makefile.am        |    2 +-
 monitor/afc/Makefile.am     |    1 -
 monitor/gdu/Makefile.am     |    1 -
 monitor/gphoto2/Makefile.am |    1 -
 monitor/hal/Makefile.am     |    1 -
 monitor/proxy/Makefile.am   |    2 --
 programs/Makefile.am        |    3 +--
 test/Makefile.am            |    3 +--
 14 files changed, 12 insertions(+), 21 deletions(-)
---