[fantasdic] (5 commits) ...F-19: kill vendorization of desktop file (fpc#247)

[Mamoru Tasaka]

Summary of changes:

  078ec06... Merge branch 'master' into f17 (*)
  9d32344... Patch to work with ruby 1.9 (bug 817855) (*)
  6fbda84... Guard sigtrap when calling Gdk::flush (bug 844754, bug 7998 (*)
  1809503... Merge remote-tracking branch 'origin/f17'
  bb1a800... F-19: kill vendorization of desktop file (fpc#247)

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