Branches for Oneiric

Author: Felix Geyer
Revision Date: 2011-09-24 10:41:02 UTC

[ Harald Sitter ]
* Set rekonq as explicit browser application in kdeglobals.
  Otherwise konqueror will be used as default when both are installed.
* Drop khtmlrc as rekonq is default browser we do not need to ship our
  outdated filter list anymore + it is easily switched on by the user.
  Also the config format scales badly to the default-settings paradigm
  as entries are numbered and so it is hard to preselect one in a way that
  will certianly also work in 3 releases (LP: #372379)

[ Felix Geyer ]
* Disable "network management subsystem was stopped or restarted" notification
  which is shown when resuming from suspend/hibernate. (LP: #820183)

Author: Pali
Revision Date: 2012-01-28 13:53:33 UTC

* bzr merge lp:ubuntu/kubuntu-default-settings