Merge branch 'ppa-daily-trunk'

Conflicts:
	debian/psensor.install

diff --cc debian/changelog
Simple merge

diff --cc debian/psensor.install
index 0163d01,716001e..463280b
--- 1/debian/psensor.install
--- 2/debian/psensor.install
+++ b/debian/psensor.install
@@@ -1,7 -1,7 +1,8 @@@
  /usr/bin/psensor
  /usr/share/applications
++/usr/share/glib-2.0
  /usr/share/icons
  /usr/share/psensor/psensor-pref.glade
  /usr/share/psensor/sensor-edit.glade
  /usr/share/psensor/psensor.glade
- /usr/share/glib-2.0/schemas/psensor.gschema.xml
 -/usr/share/glib-2.0
++