[gnome-power-manager: 8/8] Merge commit 'b0b31219d2cfdffa815659a8aad78509b65c412a'

[Adam Williamson]

commit 447adefb4e61e16ddcb0fd329b39a60b8d433dc5
Merge: dfd0f07 b0b3121
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Nov 9 17:48:27 2011 -0800

    Merge commit 'b0b31219d2cfdffa815659a8aad78509b65c412a'
    
    Conflicts:
    	.gitignore
    	gnome-power-manager.spec
    	sources

 .gitignore               |    1 +
 gnome-power-manager.spec |    5 ++++-
 sources                  |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---