[uim/f13/master: 4/4] Merge remote-tracking branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit 99d60991ff76382056d115502fa2c5f81912a2cb
Merge: 7c06cf3 4af0885
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Mar 22 20:55:19 2011 +0900

    Merge remote-tracking branch 'origin/f14/master' into f13/master

 uim-el-modeline.patch |   15 +++++++++++++++
 uim.spec              |   11 ++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---