Change offensive wording in comment.
Merge branch 'devel' into feature/wheezy
Drop obsolete GConf settings for the GNOME Panel: we have migrated this to the new configuration way already.
Do not create empty files when setting mtime to epoch (Closes: #7003).
(Try to) migrate some more GConf settings to dconf.
Drop obsolete, or useless GConf settings: let's assume GNOME3 does something sane with files of unknown type.