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

[David Zeuthen <davidz src gnome org>]

commit 300f9c5040cc80654325a84b8e082241c135ade7
Merge: 23701b0 3f7f3da
Author: David Zeuthen <davidz redhat com>
Date:   Fri Jan 20 13:43:59 2012 -0500

    Merge branch 'master' into wip/udisks2

 NEWS                    |    9 +
 client/gvfsfusedaemon.c |    1 -
 configure.ac            |    4 +-
 daemon/Makefile.am      |    8 +-
 daemon/main.c           |   13 +-
 po/ast.po               | 2068 ++++++++++++++++++--------------
 po/bg.po                |  300 +++---
 po/es.po                |   90 +-
 po/fi.po                | 1289 +++++++++++++-------
 po/gl.po                |  333 +++---
 po/he.po                |   23 +-
 po/ja.po                |  749 +++++-------
 po/mk.po                | 3076 +++++++++++++++++++++++++++++++++++-----------
 po/nb.po                |   29 +-
 po/sl.po                |   25 +-
 po/sv.po                |  477 +++++---
 po/tr.po                | 1676 ++++++++++++++++++--------
 programs/gvfs-mime.c    |   15 +
 18 files changed, 6574 insertions(+), 3611 deletions(-)
---