gnome3: screensaver timeout
adjust service name when saving to gnome keyring
Revert "rip-cd ogg/flac"

This reverts commit a595b2605a30d9a067a5e8db3d182911c3eef725.
upp: vorbis-tools
Merge remote-tracking branch 'upstream/master'