[uim/f14/master: 3/3] Merge remote-tracking branch 'origin/f15/master' into f14/master

[Akira TAGOH]

commit 4af0885f065eed38450a29fd4e6162077900e94c
Merge: 72045c7 21bccf6
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Mar 22 20:54:31 2011 +0900

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

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