[mate-panel/f17] (11 commits) ...fix merge conflict

[Wolfgang Ulbrich]

Summary of changes:

  039e09e... add new upstream 1.6.1 release (*)
  9fedf28... update spec file for new upstream release (*)
  750d40b... add mate-panel_reset_fix.patch (*)
  f5ac26e... add patch to spec file (*)
  38389e1... remove NOCONFIGURE=1 ./autogen.sh (*)
  403df94... - remove needless BR gsettings-desktop-schemas-devel (*)
  5d6fe6c... - remove %{_datadir}/mate-panelrc from file section (*)
  683ea2f... update changelog (*)
  600dd63... update panel-default-layout.dist for caja-1.6.2 (*)
  9199ee3... update spec file and pump version (*)
  c195c3e... fix merge conflict

(*) This commit already existed in another branch; no separate mail sent