[comix/f17] (5 commits) ...Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

Summary of changes:

  f6b1bee... Fix handling of exec path for detecting gettext catalog (*)
  4cea6e6... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  d4cb252... fix conflict
  660ce56... Prevent crash when non-utf8 path name is given to thumbnail (*)
  27c9bb7... Merge remote-tracking branch 'origin/master' into f17

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