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

Conflicts:
	sources
	uim.spec

.gitignore

@@ -26,3 +26,5 @@ uim-1.5.3.tar.bz2
 uim-1.5.5.tar.bz2
 uim-1.5.6.tar.bz2
 uim-1.5.7.tar.bz2
+uim-1.6.0.tar.bz2
+/uim-1.6.1.tar.bz2

sources

@@ -1 +1 @@
-cb3b9b2adaff3db9dec43658f30e9f89  uim-1.6.0.tar.bz2
+310ce3273508c1157fa510b936ce1b77  uim-1.6.1.tar.bz2

uim.spec

@@ -2,7 +2,7 @@
 %define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
 
 Name:		uim
-Version:	1.6.0
+Version:	1.6.1
 Release:	1%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
@@ -568,6 +568,9 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Wed Jan 12 2011 Akira TAGOH <tagoh@redhat.com> - 1.6.1-1
+- New upstream release.
+
 * Thu Aug 12 2010 Akira TAGOH <tagoh@redhat.com> - 1.6.0-1
 - new upstream release.