[nanny: 7/7] Merge remote-tracking branch 'telemaco/linux-session-filtering-user-space'

[Roberto Majadas <telemaco src gnome org>]

commit 193b6c30858138777a0582c829a2e100b3007622
Merge: 09a5a13 0629b62
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Sat Jun 4 02:36:15 2011 +0200

    Merge remote-tracking branch 'telemaco/linux-session-filtering-user-space'

 client/gnome/admin/nanny-desktop-blocker |    1 +
 client/gnome/admin/src/DesktopBlocker.py |    7 +
 daemon/src/LinuxSessionCKFiltering.py    |  213 -----------------------
 daemon/src/LinuxSessionFiltering.py      |  272 +++++++++++++++++-------------
 daemon/src/LinuxUsersManager.py          |    7 +
 daemon/src/Makefile.am                   |    1 -
 daemon/src/QuarterBack.py                |    2 +-
 7 files changed, 171 insertions(+), 332 deletions(-)
---