Merged gnome energymanagement branch changes