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

[Akira TAGOH]

commit 72045c73b7e4e66f2e33e8d46facdf421c1c96d4
Merge: d98fcb2 f732c70
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Jan 12 22:11:51 2011 +0900

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	sources
    	uim.spec

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