[uim/f14/master] (3 commits) ...Merge remote-tracking branch 'origin/f15/master' into f14/master

[Akira TAGOH]

Summary of changes:

  6ddfba7... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  21bccf6... backport patch from upstream to fix the modeline issue with (*)
  4af0885... Merge remote-tracking branch 'origin/f15/master' into f14/m

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