[gnome-power-manager: 4/4] Merge branch 'master' into devkit-gobject

[Richard Hughes <rhughes src gnome org>]

commit 42fd8417ab7c9ddb238cac9a4dcac11fa3d4b6ab
Merge: 9c2a0a1... 6087b51...
Author: Richard Hughes <richard hughsie com>
Date:   Tue Apr 21 12:30:10 2009 +0100

    Merge branch 'master' into devkit-gobject

 .gitignore                          |    2 +
 RELEASE                             |   13 +-
 configure.ac                        |    2 +-
 data/gnome-power-manager.schemas.in |    2 +-
 po/es.po                            |  738 ++++++++++++++++++-----------------
 src/egg-idletime.c                  |   10 +-
 src/gpm-main.c                      |   44 ++-
 src/gpm-session.c                   |  119 ++++++
 src/gpm-session.h                   |   16 +-
 9 files changed, 557 insertions(+), 389 deletions(-)