[nanny: 11/11] Merge branch 'console-kit'

[Roberto Majadas <telemaco src gnome org>]

commit e772ac93338d6de5f5981825a950b5924cf157f8
Merge: eaa5f54 9c7fdca
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Tue May 11 19:43:42 2010 +0200

    Merge branch 'console-kit'

 client/gnome/admin/Makefile.am                     |    4 +-
 client/gnome/admin/data/ui/Makefile.am             |    3 +-
 .../gnome/admin/data/ui/nanny_desktop_blocker.ui   |  111 ++++++++++
 client/gnome/admin/nanny-desktop-blocker           |   37 ++++
 client/gnome/admin/src/DesktopBlocker.py           |  113 +++++++++++
 client/gnome/admin/src/Makefile.am                 |    3 +-
 client/gnome/admin/src/__init__.py.in              |    1 +
 client/gnome/systray/nanny-systray                 |    1 +
 daemon/src/LinuxSessionCKFiltering.py              |  213 ++++++++++++++++++++
 daemon/src/Makefile.am                             |    3 +-
 daemon/src/QuarterBack.py                          |    2 +-
 po/POTFILES.in                                     |    1 +
 12 files changed, 486 insertions(+), 6 deletions(-)
---