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

[Rex Dieter]

Summary of changes:

  c63689b... initial import (*)
  15020a6... initial import (*)
  b346080... fix mateconf mistake in build (*)
  9b6680a... fix mateconf mistake in build (*)
  4e24e5c... Merge branch 'master' into f18
  05641fd... Merge branch 'f18' into f17

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