[merkaartor/f13/master] (17 commits) ...Merge branch 'master' into f13

[Sven Lankes]

Summary of changes:

  08b8e3c... Initialize branch F-12 for merkaartor (*)
  858082b... Fix typo that causes a failure to update the common directo (*)
  6554e0f... Add patch to write log to /dev/null by default (bz# 544284) (*)
  ea879db... - new upstream release (*)
  ea876f4... - new upstream release (bugfixes only) (*)
  a3f3bf9... bump to fix changelog (*)
  e56d89a... - new upstream release (fixes #570663, #575044) (*)
  e8d0705... - rebuild (exiv2) (*)
  60ba083... BR: qt4-webkit-devel (*)
  1446a97... - new upstream release (*)
  74a69d3... - new upstream release (*)
  4c9757d... - bump to fix broken dep and ftbfs (fixes #599993) (*)
  83d90a8... dist-git conversion (*)
  f8536ea... dist-git conversion (*)
  3fce347... - new upstream release - add zbar dependency to enable zbar (*)
  13551be... Initial pseudo merge for dist-git setup (*)
  494bff0... Merge branch 'master' into f13

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