[gnome-power-manager: 13/13] Merge branch 'polkit1'

[Richard Hughes <rhughes src gnome org>]

commit af19ef18b93abb7f92cb6b1345cf4c633e6f8513
Merge: 36f03d1... 55e6216...
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 6 16:15:10 2009 +0100

    Merge branch 'polkit1'

 configure.ac         |   38 ++------------------------
 data/gpm-prefs.ui    |   16 ++++++++++-
 src/Makefile.am      |    5 ---
 src/gpm-control.c    |   46 +++++++-------------------------
 src/gpm-prefs-core.c |   71 ++++++++-----------------------------------------
 5 files changed, 40 insertions(+), 136 deletions(-)
---