[mate-conf-editor/f18] (6 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  c535899... initial import (*)
  11d7a01... initial import (*)
  99bdba9... fix mateconf mistake in build (*)
  07430d1... fix mateconf mistake in build (*)
  c4771f9... Merge branch 'master' into f18 (*)
  fecc157... Merge branch 'f18' into f17 (*)

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