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

[Akira TAGOH]

commit 7c06cf3f97b113d05eaf88a421dced0ec2ea7886
Merge: bb57582 72045c7
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Jan 12 22:26:57 2011 +0900

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

 .gitignore |    1 +
 sources    |    2 +-
 uim.spec   |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---