* Merge bug fixes from trunk: - Replace enabled/disabled icons with more decent variant, thanks Kenneth Wimer! (LP: #290239) - backend.py: Rewrite timeout behaviour for more robustness; do not time out right after a long method call. - Intercept crashes of the backend (which manifest as D-BUS NoReply error), present an error message, and restart backend. (LP: #273600) - jockey-gtk: Fix crash if nothing is selected in the tree view after an operation. (LP: #283887) - fglrx.py: Unconfigured driver defaults to ati, which already provides compositing. (LP: #285879) * jockey/oslib.py, install_package(): Use --force-confnew to fix hang/crash on "EOF on stdin at conffile prompt", since the jockey backend does not have any terminal or interactivity. This fixes fglrx install failure when the upstream installer was previously used. This still keeps .dpkg-old configuration backups, and using a tool like Jockey should "make it work". (LP: #283765) * data/handlers/b43.py: Add missing OSLib import. (LP: #295530)