upower-1.0 changes

I'm forwarding Rex Dieter's upower-1.0 changes.