[nanny: 15/15] Merge branch 'policy-kit'

[Roberto Majadas <telemaco src gnome org>]

commit 40975b37111a9b43fe5f4560ff719e61f0f8d163
Merge: 09eb60d 10c1a29
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Sun Mar 14 12:29:27 2010 +0100

    Merge branch 'policy-kit'

 client/common/src/DBusClient.py                    |   10 +-
 client/common/src/Utils.py                         |   10 +-
 client/gnome/admin/Makefile.am                     |    4 +-
 .../admin/data/nanny-admin-console.desktop.in      |    2 +-
 .../admin/data/nanny-blacklist-manager.desktop.in  |    2 +-
 client/gnome/admin/data/ui/nanny_admin_console.ui  |  608 +++++++++++---------
 client/gnome/admin/data/ui/nbm_pbl_dialog.ui       |   64 ++-
 .../{NannyAdminConsole => nanny-admin-console}     |    0
 ...nnyBlacklistManager => nanny-blacklist-manager} |    0
 client/gnome/admin/src/AdminConsole.py             |   38 ++
 client/gnome/admin/src/BlacklistManager.py         |   20 +-
 client/gnome/systray/Makefile.am                   |    4 +-
 client/gnome/systray/data/nanny-systray.desktop    |    2 +-
 .../gnome/systray/{NannySystray => nanny-systray}  |    0
 configure.ac                                       |    6 +
 daemon/data/Makefile.am                            |    7 +
 daemon/data/org.gnome.nanny.policy.in              |   19 +
 daemon/src/NannyDBus.py                            |  169 +++++-
 po/POTFILES.in                                     |    1 +
 19 files changed, 642 insertions(+), 324 deletions(-)
---